Tagging features built, and more tests