Changes to address feedback, have been pushed and tests are passing.