Replaced with latest code changes

Had been developing off-line for a while.  Merged in all of the changes