Update with Bill's rewrite
Merge pull request #3 from daoudclarke/bills-rewrite

Update with Bill's rewrite