issues 1,2,3,5,6 complete.  Need to write test for issue 4