Refactored Atom
Refactored AtomList