et

diff --git a/package-lock.json b/package-lock.json
index dae27a2..fc7c07e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "openapi-validator",
-  "version": "1.0.0",
+  "name": "openapi-checker",
+  "version": "1.1.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -16,6 +16,11 @@
       "version": "1.13.3",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz",
       "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="
+    },
+    "yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     }
   }
 }
diff --git a/package.json b/package.json
index 0ad70f4..cddbd42 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "openapi-checker",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Node CLI script to validate OPENAPI Json and Yaml files using validator.swagger.io",
   "main": "validator.js",
+  "type": "module",
   "scripts": {
     "validate": "node validator.js",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,6 +23,7 @@
   "author": "Fenn-CS",
   "license": "ISC",
   "dependencies": {
-    "axios": "^0.21.1"
+    "axios": "^0.21.1",
+    "yaml": "^1.10.2"
   }
 }
diff --git a/validator.js b/validator.js
index d3cd00a..5d2cca8 100755
--- a/validator.js
+++ b/validator.js
@@ -1,34 +1,62 @@
 #!/usr/bin/env node
-const axios = require('axios');
-const fs = require('fs');
 
-let isPath = (path) => {
+import axios from 'axios';
+import YAML from 'yaml';
+import fs from 'fs';
+import path from 'path';
+import {
+    exit
+} from 'process';
+
+
+const validate = async (payload) => {
+    console.log("Validation started...");
+    let res = await axios.post('https://validator.swagger.io/validator/debug', payload);
+    if (Object.keys(res.data).length === 0) {
+        console.log("Validation passed.");
+        process.exit(0);
+    } else {
+        console.log("Validation failed\n==================\n");
+        console.log(res.data);
+        console.log("\nPaste your JSON in https://editor.swagger.io/ for more information.")
+        process.exit(1);
+    }
+}
+
+
+const isPath = (path) => {
     return /((\/)?([A-Za-z0-9_-]+)(\/)?)+[A-Za-z0-9_-]+.((json)|(yaml))/g.test(path);
 }
 
-let openapi_file = process.argv[2];
-if (openapi_file !== undefined) {
+const run = () => {
 
-    if (!isPath(openapi_file)) {
-        console.log("Invalid JSON or YAML file path: Run npm run validate <file-path> # Example /path/to/file.json");
-        return;
-    }
-    let payload = JSON.parse(fs.readFileSync(openapi_file, { encoding: 'utf8', flag: 'r' }));
-    let validate = async (payload) => {
-        let res = await axios.post('https://validator.swagger.io/validator/debug', payload);
-        if (Object.keys(res.data).length === 0) {
-            console.log("Validation passed.");
-            process.exit(0);
-        } else {
-            console.log("Validation failed\n==================\n");
-            console.log(res.data);
-            console.log("\nPaste your JSON in https://editor.swagger.io/ for more information.")
-            process.exit(1);
+    let openapi_file = process.argv[2];
+    if (openapi_file !== undefined) {
+
+        if (!isPath(openapi_file)) {
+            console.log("Invalid JSON or YAML file path: Run npm run validate <file-path> # Example /path/to/file.json");
+            exit;
         }
+
+        const extension = path.extname(openapi_file);
+        let payload = fs.readFileSync(openapi_file, {
+            encoding: 'utf8',
+            flag: 'r'
+        });
+
+        if (extension === '.json') {
+            payload = JSON.parse(payload);
+        }
+
+        if (extension === '.yaml') {
+            payload = YAML.parse(payload);
+        }
+
+        validate(payload);
+    } else {
+        console.log("Parameter missing: Run npm run validate <file-path>")
     }
-    validate(payload);
-} else {
-    console.log("Parameter missing: Run npm run validate <file-path>")
-}
 
+}
 
+run();
\ No newline at end of file