Mapping is working.
Some Housekeeping