WIP add serializer