Serialization Refactor (WIP)