refs #8: Take 2