Adding callbacks, resolving #4