Updated driver code.  Lots of hardcoded stuff left in there.