diff --git a/www/functions_MySQL.coffee b/www/functions_MySQL.coffee
index 0fd92f0..20b9c9a 100644
--- a/www/functions_MySQL.coffee
+++ b/www/functions_MySQL.coffee
@@ -416,3 +416,83 @@ exports.clearValues = (req, res) ->
                     res.json
                         status: 'OK'
     undefined
+
+
+exports.getAllDevices = (req, res) ->
+    req.app.locals.pool.getConnection (err, db) ->
+        query = 'SELECT d.id, d.name, d.address, t.dType as device_type FROM devices d JOIN device_types t ON d.device_type = t.id;'
+        db.query query (err, rows, fields) ->
+            db.release()
+            if err
+                res.json
+                    status: 'error'
+                    message: err
+                console.log err
+            else
+                res.json
+                    status: 'OK'
+                    devices: rows
+    undefined
+
+
+exports.createDevice = (req, res) ->
+    req.app.locals.pool.getConnection (err, db) ->
+        query = 'INSERT INTO devices (name, device_type, address) VALUES (?, ?, ?)'
+        db.query query, [req.body.name, req.body.device_type, req.body.address,], (err, results) ->
+            if err
+                res.json
+                    status: 'error'
+                    message: err
+                console.log err
+            else
+                res.json status: 'OK'
+    undefined
+
+
+exports.getDevice = (req, res) ->
+    req.app.locals.pool.getConnection (err, db) ->
+        query = 'SELECT d.id, d.name, d.address, t.dType as device_type FROM devices d JOIN device_types t ON d.device_type = t.id WHERE d.id = ?'
+        db.query query, [req.params.id], (err, rows) ->
+            db.release()
+            if err
+                res.json
+                    status: 'error'
+                    message: err
+                console.log err
+            else
+                res.json
+                    status: 'OK'
+                    devices: rows
+    undefined
+
+
+exports.updateDevice = (req, res) ->
+    console.log(req.body)
+    req.app.locals.pool.getConnection (err, db) ->
+        query = 'UPDATE tags set name = ?, device_type = ?, address = ? WHERE id = ?'
+        db.query query, [req.body.name, req.body.device_type, req.body.address, req.body.id], (err, results) ->
+            db.release()
+            if err
+                res.json
+                    status: 'error'
+                    message: err
+                console.log err
+            else
+                res.json
+                    status: 'OK'
+    undefined
+
+exports.deleteDevice = (req, res) ->
+    req.app.locals.pool.getConnection (err, db) ->
+        query = 'DELETE FROM devices WHERE id = ?'
+        db.query query, [req.params.id], (err, results) ->
+            db.release()
+            if err
+                res.json
+                    status: 'error'
+                    message: err
+                console.log err
+            else
+                res.json
+                    status: 'OK'
+    undefined