implemented yet another map.
Few structure changes.