boom, better user location models and a working map
resolve merge conflict