Added more methods and added a test thing.