The FS is finished for now. I might do some further detailing once it gets some brothers and sisters.
The 18 class will get a new chimney and air compressor at some stage as well as other work but at the moment it has done quite a few scale miles, now running very smoothly. The experiment of the solder filled pick-ups initially gave me a model with poor electrical contact, unable to complete a lap of a friend's layout. I applied some powdered graphite to the wheels as a temporary fix and the model has not hesitated since.