Feature/ajw add wrapper