Incorporated Lisha's design into existing files
Merge branch 'myWork'