Merging in add new tag functionality.