More refactoring, drew table of cubes