More progress made... want to save.
More tests are working... still have issue.
15 examples, 2 failures
Merge pull request #1 from jpkole/master

Only 2 tests to fix.