Callback implementation finished

Fixes #86, #87