Decorated event interception + closures WIP (task #26)