- Add some tests
- Add some comments