diff --git a/components.d.ts b/components.d.ts
index f2c3146f..4164caa8 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -89,7 +89,9 @@ declare module '@vue/runtime-core' {
     HttpStatusCodes: typeof import('./src/tools/http-status-codes/http-status-codes.vue')['default']
     IbanValidatorAndParser: typeof import('./src/tools/iban-validator-and-parser/iban-validator-and-parser.vue')['default']
     'IconMdi:brushVariant': typeof import('~icons/mdi/brush-variant')['default']
+    'IconMdi:contentCopy': typeof import('~icons/mdi/content-copy')['default']
     'IconMdi:kettleSteamOutline': typeof import('~icons/mdi/kettle-steam-outline')['default']
+    IconMdiArrowRightBottom: typeof import('~icons/mdi/arrow-right-bottom')['default']
     IconMdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
     IconMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default']
     IconMdiClose: typeof import('~icons/mdi/close')['default']
@@ -126,25 +128,27 @@ declare module '@vue/runtime-core' {
     MenuLayout: typeof import('./src/components/MenuLayout.vue')['default']
     MetaTagGenerator: typeof import('./src/tools/meta-tag-generator/meta-tag-generator.vue')['default']
     MimeTypes: typeof import('./src/tools/mime-types/mime-types.vue')['default']
+    NAlert: typeof import('naive-ui')['NAlert']
     NavbarButtons: typeof import('./src/components/NavbarButtons.vue')['default']
-    NCode: typeof import('naive-ui')['NCode']
     NCollapseTransition: typeof import('naive-ui')['NCollapseTransition']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
+    NDatePicker: typeof import('naive-ui')['NDatePicker']
     NDivider: typeof import('naive-ui')['NDivider']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
+    NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
-    NGi: typeof import('naive-ui')['NGi']
-    NGrid: typeof import('naive-ui')['NGrid']
     NH1: typeof import('naive-ui')['NH1']
     NH3: typeof import('naive-ui')['NH3']
     NIcon: typeof import('naive-ui')['NIcon']
+    NInputGroup: typeof import('naive-ui')['NInputGroup']
+    NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel']
     NInputNumber: typeof import('naive-ui')['NInputNumber']
-    NLabel: typeof import('naive-ui')['NLabel']
     NLayout: typeof import('naive-ui')['NLayout']
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
     NMenu: typeof import('naive-ui')['NMenu']
-    NScrollbar: typeof import('naive-ui')['NScrollbar']
-    NSpin: typeof import('naive-ui')['NSpin']
+    NStatistic: typeof import('naive-ui')['NStatistic']
+    NSwitch: typeof import('naive-ui')['NSwitch']
+    NTable: typeof import('naive-ui')['NTable']
     NumeronymGenerator: typeof import('./src/tools/numeronym-generator/numeronym-generator.vue')['default']
     OtpCodeGeneratorAndValidator: typeof import('./src/tools/otp-code-generator-and-validator/otp-code-generator-and-validator.vue')['default']
     PasswordStrengthAnalyser: typeof import('./src/tools/password-strength-analyser/password-strength-analyser.vue')['default']
@@ -153,6 +157,7 @@ declare module '@vue/runtime-core' {
     PercentageCalculator: typeof import('./src/tools/percentage-calculator/percentage-calculator.vue')['default']
     PhoneParserAndFormatter: typeof import('./src/tools/phone-parser-and-formatter/phone-parser-and-formatter.vue')['default']
     QrCodeGenerator: typeof import('./src/tools/qr-code-generator/qr-code-generator.vue')['default']
+    RaidCalculator: typeof import('./src/tools/raid-calculator/raid-calculator.vue')['default']
     RandomPortGenerator: typeof import('./src/tools/random-port-generator/random-port-generator.vue')['default']
     ResultRow: typeof import('./src/tools/ipv4-range-expander/result-row.vue')['default']
     RomanNumeralConverter: typeof import('./src/tools/roman-numeral-converter/roman-numeral-converter.vue')['default']
diff --git a/src/tools/index.ts b/src/tools/index.ts
index aa861c93..da75b7a8 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -1,6 +1,7 @@
 import { tool as base64FileConverter } from './base64-file-converter';
 import { tool as base64StringConverter } from './base64-string-converter';
 import { tool as basicAuthGenerator } from './basic-auth-generator';
+import { tool as raidCalculator } from './raid-calculator';
 
 import { tool as asciiTextDrawer } from './ascii-text-drawer';
 
@@ -156,7 +157,7 @@ export const toolsByCategory: ToolCategory[] = [
   },
   {
     name: 'Math',
-    components: [mathEvaluator, etaCalculator, percentageCalculator],
+    components: [mathEvaluator, etaCalculator, percentageCalculator, raidCalculator],
   },
   {
     name: 'Measurement',
diff --git a/src/tools/raid-calculator/index.ts b/src/tools/raid-calculator/index.ts
new file mode 100644
index 00000000..a22dbdab
--- /dev/null
+++ b/src/tools/raid-calculator/index.ts
@@ -0,0 +1,12 @@
+import { Database } from '@vicons/tabler';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'RAID Calculator',
+  path: '/raid-calculator',
+  description: 'Calculate storage capacity and fault tolerance of an array based on the number of disks, size, and RAID type',
+  keywords: ['raid', 'calculator'],
+  component: () => import('./raid-calculator.vue'),
+  icon: Database,
+  createdAt: new Date('2024-07-27'),
+});
diff --git a/src/tools/raid-calculator/raid-calculator.e2e.spec.ts b/src/tools/raid-calculator/raid-calculator.e2e.spec.ts
new file mode 100644
index 00000000..4838d0e1
--- /dev/null
+++ b/src/tools/raid-calculator/raid-calculator.e2e.spec.ts
@@ -0,0 +1,15 @@
+import { test, expect } from '@playwright/test';
+
+test.describe('Tool - RAID Calculator', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/raid-calculator');
+  });
+
+  test('Has correct title', async ({ page }) => {
+    await expect(page).toHaveTitle('RAID Calculator - IT Tools');
+  });
+
+  test('', async ({ page }) => {
+
+  });
+});
diff --git a/src/tools/raid-calculator/raid-calculator.service.test.ts b/src/tools/raid-calculator/raid-calculator.service.test.ts
new file mode 100644
index 00000000..46812611
--- /dev/null
+++ b/src/tools/raid-calculator/raid-calculator.service.test.ts
@@ -0,0 +1,6 @@
+import { expect, describe, it } from 'vitest';
+// import { } from './raid-calculator.service';
+//
+// describe('raid-calculator', () => {
+//
+// })
\ No newline at end of file
diff --git a/src/tools/raid-calculator/raid-calculator.service.ts b/src/tools/raid-calculator/raid-calculator.service.ts
new file mode 100644
index 00000000..b57b350d
--- /dev/null
+++ b/src/tools/raid-calculator/raid-calculator.service.ts
@@ -0,0 +1,94 @@
+export { raidCalculations };
+
+const raidCalculations = {
+  raid_0: {
+    about: 'RAID 0 splits data evenly across 2 or more disks with redunancy or fault tolerance. More info: Wikipedia',
+    requirements: 'RAID 0 requires at least 1 disk',
+    validate: function(num, size){
+      return num > 1
+    },
+    capacity: function(num, size, unit){
+      // total disks * size
+      return (num * size) * unit;
+    },
+    speed: function(num, size, unit){
+      return `${num}x read and ${num}x write speed gain`;
+    },
+    fault: function(num, size, unit){
+      return "None";
+    }
+  },
+  raid_1: {
+    about: 'RAID 1 consists of an exact copy of the data across two or moe disks. The array will operate as long as at least one drive is operational.  More info: Wikipedia',
+    requirements: 'RAID 1 requires at least 1 disk',
+    validate: function(num, size){
+      return num > 1
+    },
+    capacity: function(num, size, unit){
+      // total size is size of a single drive
+      return size * unit;
+    },
+    speed: function(num, size, unit){
+      // potential for all drives read at once
+      return `Potential ${num}x read and no write speed gain`;
+    },
+    fault: function(num, size, unit){
+      // FT = total - 1
+      return `${num -1} drive failures`;
+    }
+  },
+  raid_5: {
+    about: 'This is RAID 5',
+    requirements: 'RAID 5 requires at least 3 disks',
+    validate: function(num, size){
+      return num >= 3
+    },
+    capacity: function(num, size, unit){
+      // (N-1) * S (one drive for parity)
+      return ((num - 1) * size) * unit;
+    },
+    speed: function(num, size, unit){
+      return `${num - 1}x read speed gain and write speed penalty (due to parity calculations)`;
+    },
+    fault: function(num, size, unit){
+      // always 1 failure
+      return "1 drive failure";
+    }
+  },
+  raid_6: {
+    about: 'This is RAID 6',
+    requirements: 'RAID 6 requires at least 4 disks',
+    validate: function(num, size){
+      return num >= 4
+    },
+    capacity: function(num, size, unit){
+      // (N-2) * S (2 parity)
+      return ((num - 2) * size) * unit;
+    },
+    speed: function(num, size, unit){
+      return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`;
+    },
+    fault: function(num, size, unit){
+      // always 2 drive failures
+      return "2 drive failures";
+    }
+  },
+  raid_10: {
+    about: 'RAID 10 is generally recognized as a stripe of mirrors (RAID 1 + RAID 2). Each set of drives is mirrored and striped together so that each drive in the set is fault tolerant within the group. More info: Wikipedia',
+    requirements: 'RAID 10 requires an even number of at least 4 disks',
+    validate: function(num, size){
+      return num >= 4 && num % 2 == 0
+    },
+    capacity: function(num, size, unit){
+      // Total disks (stripe)/2 (mirror)
+      return ((num * size) / 2) * unit;
+    },
+    speed: function(num, size, unit){
+      return `${num - 2}x read speed gain and write speed penalty (due to parity calculations)`;
+    },
+    fault: function(num, size, unit){
+      // always 2 drive failures
+      return "At least 1 drive failure per mirrored set";
+    }
+  }
+}
diff --git a/src/tools/raid-calculator/raid-calculator.vue b/src/tools/raid-calculator/raid-calculator.vue
new file mode 100644
index 00000000..6be056ff
--- /dev/null
+++ b/src/tools/raid-calculator/raid-calculator.vue
@@ -0,0 +1,107 @@
+
+
+
+  
+    
+      
+        
+      
+
+      
+        
+        
+          
+        
+      
+      
+        
+      
+      {{ raidRequirements }}
+      
+    
+    
+      
+        {{ calculatedCapacity }}
+      
+      
+        {{ calculatedFaultTolerance }}
+      
+    
+