Started cleaning up the cubes a bit