WIP: cube problem; naming update.