TODOs and unit tests
Started json serializer