list based off current location rather than hard-coded
Merge remote-tracking branch 'origin/master' into master2