Committing what I have. There's a problem that needs resolving with the JSON parser.