Refactored, added incomplete serializer