Waterlogic mostly done