Trying to fix the location stuff

Close but no cigars yet..