diff --git a/server/controllers/system.php b/server/controllers/system.php
index 38e7db29..9dd1c3bf 100644
--- a/server/controllers/system.php
+++ b/server/controllers/system.php
@@ -1,11 +1,18 @@
 <?php
 require_once 'system/init-settings.php';
 require_once 'system/get-settings.php';
+require_once 'system/add-department.php';
+require_once 'system/edit-department.php';
+require_once 'system/delete-department.php';
 
 $systemControllerGroup = new ControllerGroup();
 $systemControllerGroup->setGroupPath('/system');
 
 $systemControllerGroup->addController(new InitSettingsController);
 $systemControllerGroup->addController(new GetSettingsController);
+$systemControllerGroup->addController(new AddDepartmentController);
+$systemControllerGroup->addController(new EditDepartmentController);
+$systemControllerGroup->addController(new DeleteDepartmentController);
+
 
 $systemControllerGroup->finalize();
\ No newline at end of file
diff --git a/server/controllers/system/add-department.php b/server/controllers/system/add-department.php
new file mode 100644
index 00000000..b8ca5d4d
--- /dev/null
+++ b/server/controllers/system/add-department.php
@@ -0,0 +1,34 @@
+<?php
+use Respect\Validation\Validator as DataValidator;
+
+class AddDepartmentController extends Controller {
+    const PATH = '/add-department';
+
+    public function validations() {
+        return [
+            'permission' => 'staff_3',
+            'requestData' => [
+                'name' => [
+                    'validation' => DataValidator::alnum(),
+                    'error' => ERRORS::INVALID_NAME
+                ]
+            ]
+        ];
+    }
+
+    public function handler() {
+        $name = Controller::request('name');
+        
+        $departmentInstance = new Department();
+        
+        $departmentInstance->setProperties([
+            'name' => $name,
+            
+        ]);
+
+        $departmentInstance->store();
+
+        Response::respondSuccess();
+
+    }
+}
\ No newline at end of file
diff --git a/server/controllers/system/delete-department.php b/server/controllers/system/delete-department.php
new file mode 100644
index 00000000..c57fb97b
--- /dev/null
+++ b/server/controllers/system/delete-department.php
@@ -0,0 +1,27 @@
+<?php
+use Respect\Validation\Validator as DataValidator;
+DataValidator::with('CustomValidations', true);
+
+class DeleteDepartmentController extends Controller {
+    const PATH = '/delete-department';
+
+    public function validations() {
+        return [
+            'permission' => 'staff_3',
+            'requestData' => [
+                'departmentId' => [
+                    'validation' => DataValidator::dataStoreId('department'),
+                    'error' => ERRORS::INVALID_DEPARTMENT
+                ],
+            ]
+        ];
+    }
+
+    public function handler() {
+
+        $departmentId = Controller::request('departmentId');
+        $departmentInstance = Department::getDataStore($departmentId);
+        $departmentInstance->delete();
+        Response::respondSuccess();
+    }
+}
\ No newline at end of file
diff --git a/server/controllers/system/edit-department.php b/server/controllers/system/edit-department.php
new file mode 100644
index 00000000..e6d420b1
--- /dev/null
+++ b/server/controllers/system/edit-department.php
@@ -0,0 +1,38 @@
+<?php
+use Respect\Validation\Validator as DataValidator;
+DataValidator::with('CustomValidations', true);
+
+
+class EditDepartmentController extends Controller {
+    const PATH = '/edit-department';
+
+    public function validations() {
+        return [
+            'permission' => 'staff_3',
+            'requestData' => [
+                'name' => [
+                    'validation' => DataValidator::alnum(),
+                    'error' => ERRORS::INVALID_NAME
+                ],
+                'departmentId' => [
+                    'validation' => DataValidator::dataStoreId('department'),
+                    'error' => ERRORS::INVALID_DEPARTMENT
+                ]
+            ]
+        ];
+    }
+
+    public function handler() {
+        $newname = Controller::request('name');
+        $departmentId = Controller::request('departmentId');
+
+        $departmentInstance = Department::getDataStore($departmentId);
+
+        $departmentInstance->name = $newname ;
+
+        $departmentInstance->store();
+
+        Response::respondSuccess();
+
+    }
+}
\ No newline at end of file
diff --git a/tests/init.rb b/tests/init.rb
index 0af3e81a..39acfcba 100644
--- a/tests/init.rb
+++ b/tests/init.rb
@@ -43,5 +43,8 @@ require './user/ban.rb'
 require './user/get-users-test.rb'
 require './user/delete.rb'
 require './staff/get-all.rb'
+require './system/add-department.rb'
+require './system/edit-department.rb'
+require './system/delete-department.rb'
 
 
diff --git a/tests/system/add-department.rb b/tests/system/add-department.rb
new file mode 100644
index 00000000..5da0e1ad
--- /dev/null
+++ b/tests/system/add-department.rb
@@ -0,0 +1,18 @@
+describe'system/add-department' do
+        request('/user/logout')
+        Scripts.login($staff[:email], $staff[:password], true)
+
+        it 'should add department' do
+            result= request('/system/add-department', {
+                csrf_userid: $csrf_userid,
+                csrf_token: $csrf_token,
+                name: 'new department'
+            })
+
+            (result['status']).should.equal('success')
+
+            row = $database.getRow('department', 4, 'id')
+
+            (row['name']).should.equal('new department')
+        end
+end
\ No newline at end of file
diff --git a/tests/system/delete-department.rb b/tests/system/delete-department.rb
new file mode 100644
index 00000000..0b596af9
--- /dev/null
+++ b/tests/system/delete-department.rb
@@ -0,0 +1,18 @@
+describe'system/delete-department' do
+        request('/user/logout')
+        Scripts.login($staff[:email], $staff[:password], true)
+
+        it 'should delete department' do
+            result= request('/system/delete-department', {
+                csrf_userid: $csrf_userid,
+                csrf_token: $csrf_token,
+                departmentId: 4
+            })
+
+            (result['status']).should.equal('success')
+
+            row = $database.getRow('department', 4, 'id')
+
+            (row).should.equal(nil)
+        end
+end
\ No newline at end of file
diff --git a/tests/system/edit-department.rb b/tests/system/edit-department.rb
new file mode 100644
index 00000000..e7620b6d
--- /dev/null
+++ b/tests/system/edit-department.rb
@@ -0,0 +1,19 @@
+describe'system/edit-department' do
+        request('/user/logout')
+        Scripts.login($staff[:email], $staff[:password], true)
+
+        it 'should edit department' do
+            result= request('/system/edit-department', {
+                csrf_userid: $csrf_userid,
+                csrf_token: $csrf_token,
+                name: 'second name',
+                departmentId: 4
+            })
+
+            (result['status']).should.equal('success')
+
+            row = $database.getRow('department', 4, 'id')
+
+            (row['name']).should.equal('second name')
+        end
+end
\ No newline at end of file