GH #191 - Working on callbacks.