[cosmicfish]

I would make a hydroponics annex, but also include several months worth of food stores in the cylinders. Really the cylinders are not really necessary anyway, but you might want to consider why everything is where it is.