More changes... Still need to work on serialization