First rough draft, untested
Merge pull request #2 from TheTeaNerd/starting_over

First rough draft, untested