Finished all updates for water ice. Should be good to go - ready for testing