Finished first cut of moving from XML to JSON templates