I'd just like to throw in the suggestion of building a new 'Leader'. It would have to be oil-fired, hence no need for the central fireman's compartment, and have no side corridor meaning the boiler wouldn't be off centre which seemed to be a major failing.