Include josh adams' ATM step1

This is just step1 of the atm.  Still have to wrap up step2.  Not thrilled with where step1 ended up.