Moving around, shop cleanup

We need a bit more space since John is now working on his RPU and of course my rod in there as well so we spent the day moving things around and doing general cleanup.