Tag refactor

I need opinions when you have time for them, thanks!

/cc @bloudermilk @patbenatar