about to redo templating