refactoring map almost commplete, lacks connects to change drawing tools