pulled in latest code from jhusain.  is this how this works?