tags working - needs a little work