Add more work to the Trajectory manager

This module is starting to shape up but still needs a lot of work. This
commit serves to back this work up not to really make it production.