Iwi leaders and the Government, have agreed on a deadline to sort out Maori interests in freshwater by Waitangi Day next year. It was announced at the annual Waitangi week hui for Iwi leaders in Kerikeri today, Te Manu Korihi reporter, Mani Dunlop was there.