Dev storage

This is the update for the new trajectory storage. It is still a little hacky but should work. I pull this to the master so that I can work on this with David and sort out potential bugs