Intermediate check-in on map/histogram integration