close #7 - map implementation