Changed the collision_space to use Andrew's new function. Now you need to git pull in the geo_utils as well.