Alan, with the view from your "workshop annex" I don't think you're ever going to build in the workshop again. That's either a very big tank farm or individual tanks for different offices or distributors.
Steamfan, I like the gradual changes in topography you've been creating on your layout.