Starting to get better object serialization down