Added JsonReader class, but it is unimplemented due to complexity of polymorphic json parsing. Some other cleanup.