Serialization class almost complete