Fixes: #1887 Continuing implementation of new template system