working on test 1
Merge origin/master
finished test 1 and cleaned up other test code
Merge origin/master