Great, Details I will look out for: The oval plate with a low lip. 'turbo disc'
I have seen that tank before, yep I have the shelf not those springs though.
The catcher is cool, I cant believe you have one. I have repaired catchers with a soldering iron before, so I know what you mean there. Havnt used a heat gun yet, but makes sense.