Fixed atm methods
Mostly working atm controller