work in progress on adding tagging
tagging feels like it is working