Partial iteration on Trajectory animation

Fixes #45, but introduces new bug