Still working on template resolving
Finally got templates working