Part way through re-factoring the collision handler
Creating test cases.
More collision test cases and fixing a few issues as I go :)