mostly working commit
merged matts code
edidit design1.txt