PHYS-1 #time 20m #comment Discovered further issues that must be resolved before I can get merging to happen correctly. I think the most important first step is to start passing a ShapeList into the calccollisions code, rather than a standard vector.