I completely agree, and it was definitely on my radar to do... its really ugly code in there (I take responsibility for a lot of that!) as it has been a slow incremental increase in what we actually supported... I was aiming to get a set of working /f tests before I did such a reshuffle as that is the last of the functionality that for was missing (ie I could ensure I keep it all working), but will prioritize it if you want it before that.