Blech! More merging action at work today. Probably at least another two days for this one. More old code, half finished, and shelved for six months while the main code streams moved further and further away. And just to make it interesting, it is now off the shelf and development is proceeding before I’ve finished the merge!