Change Details

todo

Depends on D4885 With this diff, I restructured previously added code so it'll be easier to understand what comes next.