Atom.
Continued refactors.