Stage 1 (nonworking) of collision function splitting
Fixes
More progress
Progress