For water, Right now I can choose between 2 one quart GI canteens and a two quarter. PLUS I have a 40 ounce SS Water bottle in a Maxped 10x4 pouch. I think I am gonna wind up with another 40oz SS bottle in another 10x4 maxped pouch.

The stove thing I haven't done anything about yet.