Trajectory is not pep8-ified. I'm doing that now.

Not ready for pull yet.