More experimental work on the wrapper.