Monkeypatched new collection library in but things are a mess - time to
start patching in new Ser/Deser system ASAP and cleaning up code.