Fixed up some code, added 2Step