Got wrapper working