Atoms and Macros done