Physics start refactoring