Cheers for that. I passed the github link and your list of features to the guys I used to work with on the Enterprise project I mention below. If it solves any pain I'll try to let you know :)