Atomic project (7/31)

Atomic project