refactor things need nunjucks to work still