added a couple more methods and tests.