removed atom stuff, need to plan this out