Fns now use model/data classes, combined some fns into 'make_model_cube'
New make_cube function