updating location code to not be so annoying... hopefully