r7316: work in progress