Refactor Tag iterator, new tag implementation, WIP