Updated Marshallers

- Updated Data Marshallers. We can now parse that big chunk of json,
wooo...