initial cut on tagging updates