I've bought one of MJJ's cats a little set of fins and an old skool Cousteau-style mask.  I'm going to start her off in the goldfish bowl and see if I can work he up to cave diving.  A diving cat - now that would be cool.