Trying to do location searching
Fixing mongo issues
Fixing merge
Removing errant imports