Filling out more of Map.hs