Adding JSON support, backup to work on at lunchtime