Opening things works for 1-8
Clean ups
Merge remote-tracking branch 'origin/master'
Dealt with conflicts