More tests
Add a couple methods
Add TODO comments