diff --git a/admin/server/controllers/systems.js b/admin/server/controllers/systems.js
index 307e1cb..9596412 100644
--- a/admin/server/controllers/systems.js
+++ b/admin/server/controllers/systems.js
@@ -69,13 +69,13 @@ exports.listSystems = async function (req, res, next) {
   const stats = await SystemStat.find({ shortName: { $in: shortNames } }).exec();
   var sys_stats = {}
   for (var i = 0; i < stats.length; i++) {
-    sys_stats[stats[i].shortName] = {};
-
-    sys_stats[stats[i].shortName]["uploadErrors"] = stats[i].uploadErrors;
-    sys_stats[stats[i].shortName]["callTotals"] = stats[i].callTotals;
-
-    sys_stats[stats[i].shortName].talkgroupStats= stats[i].talkgroupStats;
-    sys_stats[stats[i].shortName].decodeErrorsFreq = stats[i].decodeErrorsFreq;
+    console.log(stats[i])
+    sys_stats[stats[i].shortName] = {
+      uploadErrors: stats[i].uploadErrors,
+      callTotals: stats[i].callTotals,
+      talkgroupStats: stats[i].talkgroupStats,
+      decodeErrorsFreq: stats[i].decodeErrorsFreq
+    };
   }
 
   console.log(sys_stats["test"]);
diff --git a/admin/server/models/system_stat.js b/admin/server/models/system_stat.js
index add0db5..db55777 100644
--- a/admin/server/models/system_stat.js
+++ b/admin/server/models/system_stat.js
@@ -1,10 +1,27 @@
 var mongoose = require('mongoose');
 
+
+
+let decodeErrorSchema = mongoose.Schema({
+  errorHistory: [Number],
+  spikeHistory: [Number],
+})
+
+let talkgroupStatsSchema = mongoose.Schema({
+  callCountHistory: [Number],
+  callAvgLenHistory: [Number]
+})
 var systemStatSchema = mongoose.Schema({
   callTotals: [Number],
-  errorTotals: [Number],
-  usageBytes: Number,
-  usageMb: Number,
+  uploadErrors: [Number],
+  decodeErrorsFreq: {
+    type: Map,
+    of: decodeErrorSchema
+  },
+  talkgroupStats: {
+    type: Map,
+    of: talkgroupStatsSchema
+  },
   shortName: String
 }, { collection: 'system_stats' });