Wrapper complete, except callbacks