Working on the serializers

Serialization is ongoing.