Fixed some TODO, moved method move and finished it, still a problem with
pusherPosition.