Changed interface to multiindex, made combine an option