moved the serializer too, since it didn't make much sense there either