More progress on the serializer