+ Added some trajectory code.
* Formatted everything! (Didn't even check it.)