Rework the script to work with the new helpers instead of everything else.
Merge pull request #10 from danielquinn/master

Rework the script to work with the new helpers instead of everything els...