major refactoring, changing references to entityreference, removing user location detection in favor of trusting the user