Actually handling collisions1
Inclusion of some necessary code for collision handling. Currently doesn't build (need to define conventions)