Continuing work on porting over to JSON only