Implemented basic tagging (return later for greater functionality)