Update

Update on stuff.  Still more to do.
Update 2.0

Additional updates, still more to do.
Merge Frenchiefellow pull req