Closing the loop from way back in issue 1.