Matts edits #1
Matts edits #2
Matts edits #3
Merge conflicts
Merge branch 'master' of https://github.com/MatthewRueben/multiple-explorers