Started reworking the serialization system. Untested.