'''

''General''' Update to trajectories along with some general changes that allow simulator to be run

C

B
C
C