Almost have tags working correctly