More work on the wrapper.