Fix master
Work on trying to implement iter, doesn't compile