Add more tests, still need to figure out what this class should do.