Began seperation of logic and testing.
Added some changes to the persisted flag.
Merge pull request #1 from terrellt/master

Refactor for Ruby-isms + testing.