refs #11: Take 2