Collision system updated, now actually does something.

Committed this module because Josh didn't want to do it himself for
some reason, not totally sure on all of the changes that were made,
but the collision system now definately does something.