Issue #46. Branch Iss46. Step five implementation. Testing complete.