completed 16 with tests ; still get nullpointer exception if null is value for map