Almost done implementing map class