Adding v2 task/block iterator and some reorganizing