April’s waterfall table build part 2