Initial 2.0 commit
Revert to 1.9.3 version -- will do 2.0 as a separate branch.