added tagging and some templating