added iterator for map, really hack-y but it seems to be working the way we want.