Adding some marshallers, more scaffolding.
Merge pull request #3 from viig99/dev

Adding some marshallers, more scaffolding.