Turn Tag into class

This is to ensure that changes to one tag apply to all tags