Wrapper

Creating pull request to review the work done on the wrapper branch.