Feature/create basic wrapper