Made more changes to the map class trying to get it loaded and ready to run.