Continuing to add methods and tests.