Added marshalling logic to the server
Some changes made to the server code also
Still unusable...