Switching back to NBody to fix it after these big refactors