working on new templating