Some more quest templating work