More work on issue4
Merge branch 'issue4OffOfIssue3'
Issue 5
Some more work on issue5