Started refactoring geometry