Initial hydro commit