Bit more work on raw JSON view