adds some more testing
some more testing
some more testing
Merge branch 'gui' into tdd
removes deprecated files
Merge branch 'master' into gui
two screens working