Hi @BCS. My incomplete submission to Challenge 9 from last year may be of help, as it tackled a similar issue. Here’s the link to my online report and writeup
If you’re a member, you can grab the PBIX from the learning centre.
Hope this helps. Greg