Improve week bucketing
Add filtering
Usable product now!