Add controller and separate moves and move anaylses