Added survey mode, repo and controller