I am pretty much ready to merge this code and post a new build, but...
...have been quite unwell for the last two weeks or so.
So, being realistic, I don't know. Whenever I have the energy to work again.
This goes for the forum too, I'm aware that it's been a while, but just having a pretty bad time lately.