Any estimate I give needs to be doubled as I always under-estimate how much work I have left to do. I'll release a preview build for the next update now, there's a few bits missing but it's mostly there.