Most of the kinks worked out, purge not ready yet
Merge pull request #2 from mpath/cleanup

Most of the kinks worked out, purge not ready yet