[PATCH 0/8] atomic prep work