Doing one final commit before the task of merging physics with core.