more work on adding questions to templates