Finished initial version of Atom class