refs #8: Take 7