Yes! I completely forgot this one, thank you!

In fact, OP, I'm going to suggest a Youtube channel, but with some stipulations. Jackson Galaxy. He's an interesting guy who had (has?) a show on animal planet, but he has a really good grasp on Cat behavior. He get's a little weird with some of his homeopathic products that he has for sale that I'm a little skeptical of. But his cat behavior stuff all seems pretty spot on and his advice for cat care (As long as it's not about a product he sells on his site) is really good. It's worth a look I think.

In our house, the only water the cat ever wants is our water.

Put a glass on the table, and she'll go for it.

We started putting out our drinking cups with water for her in various places including extras when we're drinking water and putting glasses down where she could get them. Sometimes she acts all sneaky going for it.