Added tags back into the scheme of things.
Able to add, and view tags again.
Merge branch 'addtags'