[nobuild] Added basic Water functionality.