Part way through fixing hexes for the map
Class hiearchy for map now correct.