Collision fixed, could do with some improving

Collision class could probably be more flexible and easy to use