Molecule and Atom class drafts