Almost done. Needed classy map and organization selector