Reworked Atoms

Type checking on atoms now works.