Would you consider making the Water tracking feature more like the Steps tracker,
Doing this will allow for more water to be tracked by the app.