Updated classes in Mechanics, changed gameplay flow in NewCLIc