Snapshot - started fixing serialization - still got build errors