thx - feel free to merge this when ready