Add first cut of tags