More tweaking.  I think this is probably passable