Blah
Refactor locations