Saving work
Finished rewriting marshaller