Cubes Working?

Havent tested it yet because of a computer problem, but commiting anyway