More fleshing out of the wrapper