continue json refactor - review part 6
continue json refactor - review part 7
continue json refactor - review part 8