I concur I've done all the above so definitely you are not alone on this boat. Filling five gallon container (empty salt pail or square jugs) - put them in the sink. Keep waste water line tucked under the five gallon container. All of this helps if you have a double sink. If you do you can crimp the the waste water line a little bit and see if fits into the strainer hole portion of the sink. Never ever ever ever leave the apartment if you are filling up the container with RO/DI - murphy's law always says there is something that will go wrong. Draining the tank - stand there and hold the hose (I've walked away) and it's flooded Not sure how big the tank is - if you're filling a lot of water (5g or more) consider using a pump and tubing to pump the water back into the tank (yes, you still have to stand there).