Added back in the libwrapper stuff