Added a Collision resolution system 
Incomplete though!