All this chop and consolidation has made counting this a pain. The easiest thing for me was to just watch it and realize this was just trading in mini ranges as it stair-stepped higher.
I like this count below. So the question is are we wrapping up five waves for wave (1) of [5] or all of [5]. See the monthly below for bigger picture.
Here is the monthly below for the forest perspective