WIP: Fix serializer.