Workout Builder - Add Distance to builder

As I’m asking this I think maybe it’s harder than I think, but it would be AMAZING if as a swim workout was being built there was a cumulative distance. As I’m seeing it now, it doesn’t count while building and until it’s on the calendar the distance is not displayed.

Part 2: On the workout viewer, where the time and load is depicted, it would be good to see the distance. Right now I’m adding it to the title.