started #961, first pass