Intermediate commit
Json serializer implemented