More wrapper work. Need to fix the field initialization.