Worked on serialization (did not test at this pt)