This is kind of the direction I went in too. And like mine, I think expanding on the amount of upgrades would be awesome.
