diff --git a/apps/powermanager/ChangeLog b/apps/powermanager/ChangeLog
new file mode 100644
index 000000000..5560f00bc
--- /dev/null
+++ b/apps/powermanager/ChangeLog
@@ -0,0 +1 @@
+0.01: New App!
diff --git a/apps/powermanager/README.md b/apps/powermanager/README.md
new file mode 100644
index 000000000..f2cfcdf3e
--- /dev/null
+++ b/apps/powermanager/README.md
@@ -0,0 +1,15 @@
+# Power manager
+
+Manages settings for charging. You can set a warning threshold to be able to disconnect the charger at a given percentage. Also allows to set the battery calibration offset.
+
+## Internals
+
+Battery calibration offset is set by writing `batFullVoltage` in setting.json 
+
+## TODO
+
+* Optionally keep battery history and show as graph
+
+## Creator
+
+[halemmerich](https://github.com/halemmerich)
diff --git a/apps/powermanager/app.png b/apps/powermanager/app.png
new file mode 100644
index 000000000..dc51aa01b
Binary files /dev/null and b/apps/powermanager/app.png differ
diff --git a/apps/powermanager/boot.js b/apps/powermanager/boot.js
new file mode 100644
index 000000000..ff4ba8932
--- /dev/null
+++ b/apps/powermanager/boot.js
@@ -0,0 +1,29 @@
+(function() {
+  var settings = Object.assign(
+    require('Storage').readJSON("powermanager.default.json", true) || {},
+    require('Storage').readJSON("powermanager.json", true) || {}
+  );
+  
+  if (settings.warnEnabled){
+    print("Charge warning enabled");
+    var chargingInterval;
+
+    function handleCharging(charging){
+        if (charging){
+          if (chargingInterval) clearInterval(chargingInterval);
+          chargingInterval = setInterval(()=>{
+            if (E.getBattery() > settings.warn){
+              Bangle.buzz(1000);
+            }
+          }, 10000);
+      }
+      if (chargingInterval && !charging){
+        clearInterval(chargingInterval);
+        chargingInterval = undefined;
+      }
+    }
+
+    Bangle.on("charging",handleCharging);
+    handleCharging(Bangle.isCharging());
+  }
+})();
diff --git a/apps/powermanager/default.json b/apps/powermanager/default.json
new file mode 100644
index 000000000..a6d8412b2
--- /dev/null
+++ b/apps/powermanager/default.json
@@ -0,0 +1,4 @@
+{
+  "warnEnabled": false,
+  "warn": 96
+}
diff --git a/apps/powermanager/metadata.json b/apps/powermanager/metadata.json
new file mode 100644
index 000000000..3ad31ba1e
--- /dev/null
+++ b/apps/powermanager/metadata.json
@@ -0,0 +1,17 @@
+{
+  "id": "powermanager",
+  "name": "Power Manager",
+  "shortName": "Power Manager",
+  "version": "0.01",
+  "description": "Allow configuration of warnings and thresholds for battery charging and display.",
+  "icon": "app.png",
+  "type": "bootloader",
+  "tags": "tool",
+  "supports": ["BANGLEJS2"],
+  "readme": "README.md",
+  "storage": [
+    {"name":"powermanager.boot.js","url":"boot.js"},
+    {"name":"powermanager.settings.js","url":"settings.js"},
+    {"name":"powermanager.default.json","url":"default.json"}
+  ]
+}
diff --git a/apps/powermanager/settings.js b/apps/powermanager/settings.js
new file mode 100644
index 000000000..c8aa057fa
--- /dev/null
+++ b/apps/powermanager/settings.js
@@ -0,0 +1,125 @@
+(function(back) {
+  var systemsettings = require("Storage").readJSON("setting.json") || {};
+
+  function writeSettings(key, value) {
+    var s = require('Storage').readJSON(FILE, true) || {};
+    s[key] = value;
+    require('Storage').writeJSON(FILE, s);
+    readSettings();
+  }
+
+  function readSettings() {
+    settings = Object.assign(
+      require('Storage').readJSON("powermanager.default.json", true) || {},
+      require('Storage').readJSON(FILE, true) || {}
+    );
+  }
+
+  var FILE = "powermanager.json";
+  var settings;
+  readSettings();
+
+  var mainmenu = {
+    '': {
+      'title': 'Power Manager'
+    },
+    '< Back': back,
+    'Charge warning': function() {
+      E.showMenu(submenu_chargewarn);
+    },
+    'Calibrate': function() {
+      E.showMenu(submenu_calibrate);
+    }
+  };
+
+
+  function roundToDigits(number, stepsize) {
+    return Math.round(number / stepsize) * stepsize;
+  }
+
+  function getCurrentVoltageDirect() {
+    return (analogRead(D3) + analogRead(D3) + analogRead(D3) + analogRead(D3)) / 4;
+  }
+
+  var stepsize = 0.0002;
+  var full = 0.32;
+
+  function getInitialCalibrationOffset() {
+    return roundToDigits(systemsettings.batFullVoltage - full, stepsize) || 0;
+  }
+
+
+  var submenu_calibrate = {
+    '': {
+      title: "Calibrate"
+    },
+    '< Back': function() {
+      E.showMenu(mainmenu);
+    },
+    'Offset': {
+      min: -0.05,
+      max: 0.05,
+      step: stepsize,
+      value: getInitialCalibrationOffset(),
+      format: v => roundToDigits(v, stepsize).toFixed((""+stepsize).length - 2),
+      onchange: v => {
+        print(typeof v);
+        systemsettings.batFullVoltage = v + full;
+        require("Storage").writeJSON("setting.json", systemsettings);
+      }
+    },
+    'Auto': function() {
+      var newVoltage = getCurrentVoltageDirect();
+      E.showAlert("Please charge fully before auto setting").then(() => {
+        E.showPrompt("Set current charge as full").then((r) => {
+          if (r) {
+            systemsettings.batFullVoltage = newVoltage;
+            require("Storage").writeJSON("setting.json", systemsettings);
+            //reset value shown in menu to the newly set one
+            submenu_calibrate.Offset.value = getInitialCalibrationOffset();
+            E.showMenu(mainmenu);
+          }
+        });
+      });
+    },
+    'Clear': function() {
+      E.showPrompt("Clear charging offset?").then((r) => {
+        if (r) {
+          delete systemsettings.batFullVoltage;
+          require("Storage").writeJSON("setting.json", systemsettings);
+          //reset value shown in menu to the newly set one
+          submenu_calibrate.Offset.value = getInitialCalibrationOffset();
+          E.showMenu(mainmenu);
+        }
+      });
+    }
+  };
+
+  var submenu_chargewarn = {
+    '': {
+      title: "Charge warning"
+    },
+    '< Back': function() {
+      E.showMenu(mainmenu);
+    },
+    'Enabled': {
+      value: !!settings.warnEnabled,
+      format: v => settings.warnEnabled ? "On" : "Off",
+      onchange: v => {
+        writeSettings("warnEnabled", v);
+      }
+    },
+    'Percentage': {
+      min: 80,
+      max: 100,
+      step: 2,
+      value: settings.warn,
+      format: v => v + "%",
+      onchange: v => {
+        writeSettings("warn", v);
+      }
+    }
+  };
+
+  E.showMenu(mainmenu);
+})