refactoring of controls, new map system appears to worrk