Initial commit of wrapper work