preceding pull
Merge https://github.com/Fallacies-TE/GravSim
intermediate changes to include collision