Finished up tagging finally