Map progress.

Played around with the map class.