Major modifications to wt.
Merge pull request #1 from stephenbalaban/master

Major modifications to wt.