Started code for Collision Handling + added Test Plan