That is the plan. In the last 12 months I have spent a lot of money upgrading my workshop, including a new table saw. For years I never needed one since I always had the keys to a school machinery shop which I had fitted out very well indeed. Apart from a bigger thickneser and a bigger bandsaw the machinery side of things is sorted. And I do like machinery. But I am not content with the hand tools I have and so that is the goal for the next few months. I have become a big fan of Veritas saws and planes. When I make things I mostly do all the stock preparation with machines and all the joinery by hand.
My head is so full of projects and ideas and currently my free time is limited but patience is a good thing to learn.