Added collision detection and drawing