I3 Tagging feature complete