Looks like step 1's implented, though I'm not a fan

Way too much awkwardness in the Atm module, need to figure out how to
write this stuff more appropriately before I'll be happy with it.