Made huge changes.  All correct now.