Major refactor to tidy up the code ready for supporting detached templates