Physics refactoring.