More work on adding the tags.