Better marshalling/unmarshalling

Signed-off-by: Rick Copeland <rick@synapp.io>