Revert "Revert "think I did all the JSON""

This reverts commit 7a2d90aa69248f494700d86847204340da3990a2.
omit empty doesn't seem to help