Rolling last 4 weeks average Vs last week

[Marcel_Garcia]

I'm trying to create two new master dimensions for a Pivot table based on time.
One showing last rolling 4 weeks average and the other showing just last week,
in substitution of the Drill down dimension I have at the moment with Quarters.

Not sure what is the best solution.