#224 working on serialization client