Many imporvements to the wrapper. Still not ready!