US573 - Refactored to bring old code into line and further developed story
US573 - Refactor tests
Merge branch 'development-us573' into development