Temp commit after fixing branch
Collision detection is now working, but needs refactoring