added tag capabilities and started with templating