- Rearranging code, adding new serialization stuff.