@nikgeneburn Can I give a suggestion that I believe should be in the game?
In the hideout, especially now that it requires some FiR items, when you have components for an upgrade you should be able to “install” them into the upgrade.
They are then locked into that upgrade, but out of stash