Preparing for Trajectory Generation. Cleaning up, and saving more data.