diff --git a/Makefile b/Makefile
index 1e551a7..a941e67 100644
--- a/Makefile
+++ b/Makefile
@@ -13,4 +13,4 @@ clean:
 	rm -f bin/*
 
 install:
-	cp bin/ontvacstat /usr/local/bin
\ No newline at end of file
+	cp bin/ontvacstat /usr/local/bin
diff --git a/contrib/grafana/dashboard.json b/contrib/grafana/dashboard.json
index c1134a4..11025a0 100644
--- a/contrib/grafana/dashboard.json
+++ b/contrib/grafana/dashboard.json
@@ -37,8 +37,8 @@
       "overrides": []
     },
     "gridPos": {
-      "h": 6,
-      "w": 4,
+      "h": 3,
+      "w": 10,
       "x": 0,
       "y": 0
     },
@@ -118,18 +118,18 @@
       "overrides": []
     },
     "gridPos": {
-      "h": 6,
-      "w": 6,
-      "x": 4,
-      "y": 0
+      "h": 7,
+      "w": 10,
+      "x": 0,
+      "y": 3
     },
     "id": 14,
     "options": {
       "graph": {},
       "legend": {
         "calcs": [],
-        "displayMode": "table",
-        "placement": "right"
+        "displayMode": "list",
+        "placement": "bottom"
       },
       "tooltipOptions": {
         "mode": "single"
@@ -209,7 +209,7 @@
       "h": 6,
       "w": 10,
       "x": 0,
-      "y": 6
+      "y": 10
     },
     "id": 10,
     "options": {
@@ -226,21 +226,21 @@
     "pluginVersion": "7.5.1",
     "targets": [{
       "exemplar": true,
-      "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d])",
+      "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[7d])",
       "interval": "",
       "intervalFactor": 1,
       "legendFormat": "Combined",
       "refId": "A"
     }, {
       "exemplar": true,
-      "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[3d])",
+      "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[7d])",
       "hide": false,
       "interval": "",
       "legendFormat": "First Does",
       "refId": "B"
     }, {
       "exemplar": true,
-      "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[3d])",
+      "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[7d])",
       "hide": false,
       "interval": "",
       "legendFormat": "Fully Vaccinated",
@@ -248,97 +248,8 @@
     }],
     "timeFrom": null,
     "timeShift": null,
-    "title": "Vacination Rate (3 day avg)",
+    "title": "Vacination Rate (7 day avg)",
     "type": "timeseries"
-  }, {
-    "datasource": null,
-    "description": "% of Ontario Population partially or Fully Vaccinated.",
-    "fieldConfig": {
-      "defaults": {
-        "color": {
-          "mode": "thresholds"
-        },
-        "decimals": 1,
-        "mappings": [],
-        "thresholds": {
-          "mode": "absolute",
-          "steps": [{
-            "color": "dark-red",
-            "value": null
-          }, {
-            "color": "semi-dark-red",
-            "value": 40
-          }, {
-            "color": "light-red",
-            "value": 50
-          }, {
-            "color": "semi-dark-yellow",
-            "value": 60
-          }, {
-            "color": "light-yellow",
-            "value": 70
-          }, {
-            "color": "light-green",
-            "value": 80
-          }, {
-            "color": "semi-dark-green",
-            "value": 90
-          }]
-        },
-        "unit": "percent"
-      },
-      "overrides": []
-    },
-    "gridPos": {
-      "h": 8,
-      "w": 10,
-      "x": 0,
-      "y": 12
-    },
-    "id": 2,
-    "links": [],
-    "options": {
-      "orientation": "horizontal",
-      "reduceOptions": {
-        "calcs": [
-          "lastNotNull"
-        ],
-        "fields": "",
-        "values": false
-      },
-      "showThresholdLabels": false,
-      "showThresholdMarkers": true,
-      "text": {}
-    },
-    "pluginVersion": "7.5.1",
-    "targets": [{
-      "exemplar": true,
-      "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population) * 100",
-      "format": "time_series",
-      "interval": "",
-      "intervalFactor": 1,
-      "legendFormat": "Partially Vaccinated",
-      "refId": "A"
-    }, {
-      "exemplar": true,
-      "expr": "ontvacstat_total_individuals_fully_vaccinated / ontvacstat_eligible_population * 100",
-      "format": "time_series",
-      "interval": "",
-      "intervalFactor": 1,
-      "legendFormat": "Fully Vaccinated",
-      "refId": "B"
-    }, {
-      "exemplar": true,
-      "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100",
-      "hide": false,
-      "interval": "",
-      "legendFormat": "Combined",
-      "refId": "C"
-    }],
-    "timeFrom": null,
-    "timeShift": null,
-    "title": "Overall % Vaccinated",
-    "type": "gauge"
   }, {
     "datasource": null,
     "description": "",
@@ -382,7 +293,7 @@
       "h": 8,
       "w": 10,
       "x": 0,
-      "y": 20
+      "y": 16
     },
     "id": 19,
     "links": [],
@@ -464,11 +375,159 @@
       "interval": "",
       "legendFormat": "18+",
       "refId": "I"
+    }, {
+      "exemplar": true,
+      "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "12 +",
+      "refId": "J"
     }],
     "timeFrom": null,
     "timeShift": null,
     "title": "At Least One Dose by Age",
     "type": "gauge"
+  }, {
+    "datasource": null,
+    "description": "",
+    "fieldConfig": {
+      "defaults": {
+        "color": {
+          "mode": "palette-classic"
+        },
+        "custom": {
+          "axisLabel": "",
+          "axisPlacement": "auto",
+          "barAlignment": 0,
+          "drawStyle": "line",
+          "fillOpacity": 0,
+          "gradientMode": "none",
+          "hideFrom": {
+            "graph": false,
+            "legend": false,
+            "tooltip": false
+          },
+          "lineInterpolation": "linear",
+          "lineWidth": 1,
+          "pointSize": 5,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "showPoints": "auto",
+          "spanNulls": false
+        },
+        "decimals": 1,
+        "mappings": [],
+        "thresholds": {
+          "mode": "absolute",
+          "steps": [{
+            "color": "dark-red",
+            "value": null
+          }, {
+            "color": "semi-dark-red",
+            "value": 40
+          }, {
+            "color": "light-red",
+            "value": 50
+          }, {
+            "color": "semi-dark-yellow",
+            "value": 60
+          }, {
+            "color": "light-yellow",
+            "value": 70
+          }, {
+            "color": "light-green",
+            "value": 80
+          }, {
+            "color": "semi-dark-green",
+            "value": 90
+          }]
+        },
+        "unit": "percent"
+      },
+      "overrides": []
+    },
+    "gridPos": {
+      "h": 8,
+      "w": 10,
+      "x": 0,
+      "y": 24
+    },
+    "id": 20,
+    "links": [],
+    "options": {
+      "legend": {
+        "calcs": [],
+        "displayMode": "list",
+        "placement": "bottom"
+      },
+      "tooltipOptions": {
+        "mode": "single"
+      }
+    },
+    "pluginVersion": "7.5.1",
+    "targets": [{
+      "exemplar": true,
+      "expr": "ontvacstat_age_12_17yrs_percent_at_least_one_dose * 100",
+      "format": "time_series",
+      "interval": "",
+      "intervalFactor": 1,
+      "legendFormat": "12-17",
+      "refId": "A"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_18_29yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "18-29",
+      "refId": "B"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_30_39yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "30-39",
+      "refId": "C"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_40_49yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "40-49",
+      "refId": "D"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_50_59yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "50-59",
+      "refId": "E"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_60_69yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "60-69",
+      "refId": "F"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_70_79yrs_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "70-79",
+      "refId": "G"
+    }, {
+      "exemplar": true,
+      "expr": "ontvacstat_age_80_plus_percent_at_least_one_dose * 100",
+      "hide": false,
+      "interval": "",
+      "legendFormat": "80+",
+      "refId": "H"
+    }],
+    "timeFrom": null,
+    "timeShift": null,
+    "title": "At Least One Dose by Age",
+    "type": "timeseries"
   }],
   "refresh": "1h",
   "schemaVersion": 27,
@@ -504,5 +563,5 @@
   "timezone": "",
   "title": "Ontario Vaccination Stats",
   "uid": "vhnVv3lMk",
-  "version": 71
+  "version": 77
 }
\ No newline at end of file
diff --git a/contrib/update_dashboard/ontvacstats-snapshot.json b/contrib/update_dashboard/ontvacstats-snapshot.json
index bc8326f..a403383 100644
--- a/contrib/update_dashboard/ontvacstats-snapshot.json
+++ b/contrib/update_dashboard/ontvacstats-snapshot.json
@@ -38,8 +38,8 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 4,
+        "h": 3,
+        "w": 10,
         "x": 0,
         "y": 0
       },
@@ -119,18 +119,18 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 6,
-        "w": 6,
-        "x": 4,
-        "y": 0
+        "h": 7,
+        "w": 10,
+        "x": 0,
+        "y": 3
       },
       "id": 14,
       "options": {
         "graph": {},
         "legend": {
           "calcs": [],
-          "displayMode": "table",
-          "placement": "right"
+          "displayMode": "list",
+          "placement": "bottom"
         },
         "tooltipOptions": {
           "mode": "single"
@@ -210,7 +210,7 @@
         "h": 6,
         "w": 10,
         "x": 0,
-        "y": 6
+        "y": 10
       },
       "id": 10,
       "options": {
@@ -227,21 +227,21 @@
       "pluginVersion": "7.5.1",
       "targets": [{
         "exemplar": true,
-        "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[3d])",
+        "expr": "avg_over_time(ontvacstat_previous_day_doses_administered[7d])",
         "interval": "",
         "intervalFactor": 1,
         "legendFormat": "Combined",
         "refId": "A"
       }, {
         "exemplar": true,
-        "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[3d])",
+        "expr": "avg_over_time(ontvacstat_previous_day_at_least_one[7d])",
         "hide": false,
         "interval": "",
         "legendFormat": "First Does",
         "refId": "B"
       }, {
         "exemplar": true,
-        "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[3d])",
+        "expr": "avg_over_time(ontvacstat_previous_day_fully_vaccinated[7d])",
         "hide": false,
         "interval": "",
         "legendFormat": "Fully Vaccinated",
@@ -249,97 +249,8 @@
       }],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Vacination Rate (3 day avg)",
+      "title": "Vacination Rate (7 day avg)",
       "type": "timeseries"
-    }, {
-      "datasource": null,
-      "description": "% of Ontario Population partially or Fully Vaccinated.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [{
-              "color": "dark-red",
-              "value": null
-            }, {
-              "color": "semi-dark-red",
-              "value": 40
-            }, {
-              "color": "light-red",
-              "value": 50
-            }, {
-              "color": "semi-dark-yellow",
-              "value": 60
-            }, {
-              "color": "light-yellow",
-              "value": 70
-            }, {
-              "color": "light-green",
-              "value": 80
-            }, {
-              "color": "semi-dark-green",
-              "value": 90
-            }]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 10,
-        "x": 0,
-        "y": 12
-      },
-      "id": 2,
-      "links": [],
-      "options": {
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "text": {}
-      },
-      "pluginVersion": "7.5.1",
-      "targets": [{
-        "exemplar": true,
-        "expr": "(ontvacstat_total_doses_administered - ontvacstat_total_doses_in_fully_vaccinated_individuals) / (ontvacstat_eligible_population) * 100",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 1,
-        "legendFormat": "Partially Vaccinated",
-        "refId": "A"
-      }, {
-        "exemplar": true,
-        "expr": "ontvacstat_total_individuals_fully_vaccinated / ontvacstat_eligible_population * 100",
-        "format": "time_series",
-        "interval": "",
-        "intervalFactor": 1,
-        "legendFormat": "Fully Vaccinated",
-        "refId": "B"
-      }, {
-        "exemplar": true,
-        "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100",
-        "hide": false,
-        "interval": "",
-        "legendFormat": "Combined",
-        "refId": "C"
-      }],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Overall % Vaccinated",
-      "type": "gauge"
     }, {
       "datasource": null,
       "description": "",
@@ -383,7 +294,7 @@
         "h": 8,
         "w": 10,
         "x": 0,
-        "y": 20
+        "y": 16
       },
       "id": 19,
       "links": [],
@@ -465,11 +376,159 @@
         "interval": "",
         "legendFormat": "18+",
         "refId": "I"
+      }, {
+        "exemplar": true,
+        "expr": "(ontvacstat_total_individuals_at_least_one) / (ontvacstat_eligible_population) * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "12 +",
+        "refId": "J"
       }],
       "timeFrom": null,
       "timeShift": null,
       "title": "At Least One Dose by Age",
       "type": "gauge"
+    }, {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false
+          },
+          "decimals": 1,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [{
+              "color": "dark-red",
+              "value": null
+            }, {
+              "color": "semi-dark-red",
+              "value": 40
+            }, {
+              "color": "light-red",
+              "value": 50
+            }, {
+              "color": "semi-dark-yellow",
+              "value": 60
+            }, {
+              "color": "light-yellow",
+              "value": 70
+            }, {
+              "color": "light-green",
+              "value": 80
+            }, {
+              "color": "semi-dark-green",
+              "value": 90
+            }]
+          },
+          "unit": "percent"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 0,
+        "y": 24
+      },
+      "id": 20,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.5.1",
+      "targets": [{
+        "exemplar": true,
+        "expr": "ontvacstat_age_12_17yrs_percent_at_least_one_dose * 100",
+        "format": "time_series",
+        "interval": "",
+        "intervalFactor": 1,
+        "legendFormat": "12-17",
+        "refId": "A"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_18_29yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "18-29",
+        "refId": "B"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_30_39yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "30-39",
+        "refId": "C"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_40_49yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "40-49",
+        "refId": "D"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_50_59yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "50-59",
+        "refId": "E"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_60_69yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "60-69",
+        "refId": "F"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_70_79yrs_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "70-79",
+        "refId": "G"
+      }, {
+        "exemplar": true,
+        "expr": "ontvacstat_age_80_plus_percent_at_least_one_dose * 100",
+        "hide": false,
+        "interval": "",
+        "legendFormat": "80+",
+        "refId": "H"
+      }],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "At Least One Dose by Age",
+      "type": "timeseries"
     }],
     "refresh": "1h",
     "schemaVersion": 27,
@@ -505,7 +564,7 @@
     "timezone": "",
     "title": "Ontario Vaccination Stats",
     "uid": "vhnVv3lMk",
-    "version": 71
+    "version": 77
   },
   "expires": 86400,
   "key": "ontvacstats"