A little more work, fully renamed Class36 although it's purpose is yet to be discovered.