Fixed everything but a serializer