Added collision (untested)

Added some small functionality and the collisionmanager