I don't think I'm reading these changes properly. So for each callback function (4 of them) I need to create a 'wrapper' function which takes an extra argument containing the pointer to the class? Because I've done this and compiler now complains that it can't use the new function as the callback.