A 32 oz Nalgene bottle (wide mouth) and a slip on the bottom GSI stainless cup. OR sells a belt holster for water bottles, but they don't seem to ride very well.
Haven't touch a G I anything since my military days.