Fix MainController, add Move