Welcome back IR & well done, you had certinately done a lot to that layout since I first seen it in 2012, when I used to be working, now very happily retired, & now you have moved you'll have a great chance to build what you want. I do remember seeing the container crane & the clamped car, ( poor bugger ) & as you'er now building a new layout, I'll be watching with great interest, I'm starting planning mine at this time, so keep the pics coming, & the best of luck. I had not seen the two oil drums before, mind telling me where you got them, PS I can feel the heat from that stove even here !!!