Serialization works; working on deserialization

Compiling but non-passing tests