Nice work looks like a keeper!
Yeah I can't see him going anywhere for a while. The machine is in pretty good condition and needs a little bit of tinkering here and there which is going to be fun.
If anyone has seen any NOS Atari pop bumper caps in their travels I be interested to hear about them.