Minor tweaking.
Middle of refactoring. Doesn't compile, need to add Gson serializers and
deserializers and fix Json.java.
Major rewrite to improve Json handling, all done.