More controller refactoring, working on win prompt