Issue 3 nearly complete - needs some testing