mid-fixup checkin, not tested or ready yet but getting close