worked some more on simplifying wrapers