Big Change

Marshalling + changing some logic around + documentation.
Ok
okay