More tweaks.  Needs a *lot* of work!!