Seems to be all working now.  But needs cleanup.