First version of hdf5_refactor is working