I'm basically finished working through the implications of the restructuring for the part that can be finished this year. Have now been going through and cleaning up test cases and porting changes from the HEAD into the development branch. It's been 1.5 months since I forked the code to work on this. A lot of that time was actually taken up with external tasks, but even so, there's a lot of changes to be merged in, with a number of conflicts here and there. Not real problems, just enough to slow down the process and require more testing each time.

On the very bright side, I have 4 days recordings of Brave New Waves on tap... yay! Don't know why there are only 4 (should be more), but it's still almost 16 hours of funky-cool listening (5 hours in at the moment).