More work on wrapper.