almost done with wrapper