tags

The branch is misleading decided to add tag support instead.