Locationbranch

AddObserver pull request.