Move to tag-based approach
Merge pull request #2 from TabDigital/tags

Move to tag-based approach