Refactoring
Properly passing through cb_ctx to callbacks now