Rewrote atom.hpp and split it into atom.cpp