Amazing new feature

@leni-kirilov should look at this!