Right. Decided to get rid of the table saw and I bought a huge storage box to go where it was. In that goes all the power tools and the car jack and axle stands. Not super happy about them all in there but not sure what else to do.
Then another set of mini drawers for the gubbins, and a storage tray for all my fasteners.
Re purposed an old toolbox for the tools that are in baksets on the shelves. Will rearrange the bins on the wall so I can fix commonly needed tools to a board. Must get some peg board.