Fiddle with maps - add an experimental leader character and re-org a bit
to put more map stuff in one place.