Overhaul, includes JSON parser.