Tweaked and polished.  Tested and working.