More progress with wrappers.