stable, preparing to implement layered map