finishing up the wrapper - should works

Need some testing