Atom tinkering, prepare for new config system
More rate work