wip
switches to basic templating
fixed merge conflict