Task #0030: Trajectory handling work in progress.