Feature/template parsing

[alistair-lilley]

Need to make progress on Papers to get a better idea of how to continue Templates, merging to dev to bring into Papers