I ended up picking one of these up - free shipping. It will hold 19 actual gallons. Should still be plenty for what I would want to do with water changes. I should not have to worry about overflowing containers.

http://www.westsidewholesale.com/ind...@@@&pid=975727