Starting wrapper refactor