Country Club/Waldo area plan