WIP3: Tests are working the first time but state is hanging around in atom