Starting on a better deserializer that matches the serializer