Atom class almost done