Finishing up our tagging system