Add back in support for templates, basics for a model