Begin Trajectory refactoring