Added stuff for the H2O making, not finished but it's a start (and it compiles).