Added HDF5 stuff... oh well