working with the wrappers. almost done