Need to fix in TODO in Map.h