Implemented tagging - still ugly as hell