Waterfall Chart Not Working as a Go Foward, Steps Show Deltas From Prior Period for that Step

[JamesChurch]

Good afternoon, hope you're doing well. I'm having trouble with a waterfall chart I'm trying to put together. It's supposed to represent revenue streams and expenses quarter over quarter with the quarterly columns showing net revenue over time, starting at zero net revenue at the start of FY 22 Q1.

The issue I'm having is that my first quarter shows the net for that quarter's activity, when I'd like it to start at zero with that net number showing as the start of Q2 as a result of the prior quarter. The other issue is that the steps (Rev Stream 1, Rev Stream 2, and OpEx) don't show the activity for the quarter by itself, but instead shows the delta from the prior quarter.

As pictured above, it's showing the delta of OpEx QoQ when I just want to show the OpEx number for that quarter by itself. All my revenue streams should be positive and expenses negative, but due to how it's making this comparison by default, this is not the case.

Here is what my unpivoted table currently looks like:

QtrYr	Attribute	Value
FY22 Q1	RevStream2	$      4,250,000.00
FY22 Q1	RevStream1	$    10,500,000.00
FY22 Q1	OpEx	$    (1,750,000.00)
FY22 Q2	RevStream2	$      1,000,000.00
FY22 Q2	RevStream1	$      8,000,000.00
FY22 Q2	OpEx	$    (2,500,000.00)
FY22 Q3	RevStream2	$      1,250,000.00
FY22 Q3	RevStream1	$    25,000,000.00
FY22 Q3	OpEx	$    (5,500,000.00)
FY22 Q4	RevStream2	$      1,600,000.00
FY22 Q4	RevStream1	$    11,000,000.00
FY22 Q4	OpEx	$    (3,250,000.00)
FY23 Q1	RevStream2	$      3,000,000.00
FY23 Q1	RevStream1	$    15,000,000.00
FY23 Q1	OpEx	$    (5,000,000.00)

What I want it to show is $0 for the FY 22 Q1 bar, followed by the two rev streams and the opex by itself with no comparison (4.25M, 10.5M, -$1.75M) bridging to the net ($13M) as the blue bar for the start of FY 22 Q2. Then it should show the Q2 numbers ($1M, $8M, -$2.5M) with the FY 22 Q3 being the total net thus far ($19.5M) and so on.

I'm open to any sort of table structure changes, PQ transformations, or measurements to achieve what I'm looking to do. I'm open to any sort of tips as to what they best practice may be. Thank you kindly.

[JamesChurch]

I'm still trying to solution this if anyone has any recommendations. Thank you.