Starting to add Atom back