intermediate checkin re: #20