Added the CollisionHandler

First commit to include the handler, still not functional correctly