Added movement and collision detection