Almost have my final wrapper function