move old map_us code to OLD; comprehension version to current