Trajectory

This looks uglier. Perhaps a trajectory should point to its body, so we don't have to keep  handling both? A job for another CL anyway.