Could you add unit tests?  I don't see any coverage.