Refactor hammy move, add update loop