a little more tweaking.  Things are still far from complete... getting there...