Got the build-service macro working with tests... working on making the transport/serialization stuff functional
Fixed merge conflicts