Added some of the code for the collision resolver class