Merge pull request #1 from nubs/master

Initial commit.
Remove final so this can be mocked.