Added auto location

Not a fan of how location is found but it does work.