started to add tagging with unit testing