Another big refactor to get the dataset logic a little cleaner and to get a basic cubing approach going