Updated Collision

Handles red and green collision.