Started the addition of the map-class. Ran out of time before class, so I am going to work on it later.