Progress on template inclusion
Wip