Added collision and movement