Made quite a bit of progress today.
Well, I could have finished it. But I was busy doing nothing for a couple of hours so, in the end I did pretty much everything aside from the Funnels. I should be able to finish it tomorrow.