First ever working version - Water seems to be there!