Some DI work on the location class