added location stuff, needs integration