Busted the Template service into two layers.
Merge branch 'refactor_service' into dev