Finished up the testable functionality.