Add Cropped, refactor, more tests.