Cleanups
Cleanups and a very basic replication setup.

Note to self: IncomingMessage and Marshaller suck.
Cleaned up marshalled a bit