Completely revamping this wrapper.