So I did some more work over the winter, I waved my magic wand and voila. It still needs some small things to be complete.