My original plan was to keep the cab intact and just make the edges of the firebox more rounded. But it didn't work. So I'll be doing what Awdry did with his Donald model and fashion a new cab. I've already ordered a PCV pipe for the rest of the boiler.
