Did some basic work with the wrapper