r7418: work in progress