#1 Adding extra classes and a 'is tagged' state
Merge branch 'feature-swap-buttons'