Added functionality to classes.  Minor change to goof around map.