more map state work (still not building)