Atom refactor, WIP