Added location query

Doesn't work for some reason, committing before I try something
completely different.