WIP - moved cross_border + border_patrol - please fix api_auth ref after pull request