Move Towards Added PW Reset and collection of other junky changes.  Commit before 3.0 Rewrite
Added Framework Scheme, and general fixes