Work continues on JSON