Added water puzzle and changed solver and design