more tooling with location stuff