Working on the collision functions

Also first test run