diff --git a/src/timeConversion.js b/src/timeConversion.js
new file mode 100644
index 00000000..d9b4d5cd
--- /dev/null
+++ b/src/timeConversion.js
@@ -0,0 +1,33 @@
+export default timeConversions
+
+/**
+ *
+ * This method will convert time in 12 hours format to 24 hours format
+ *
+ * @param {String} time - time in 12 hours format example 01:12:45AM or 06:48:56PM
+ * @return {String} - converted time in 24 hours example 01:12:45 or 18:48:56
+ */
+
+function timeConversions(time) {
+   
+  let convertedTime= time.substr(2, 6)
+  if(time.charAt(8)==='A'){
+  if(time.charAt(0)==='1' && time.charAt(1)==='2'){
+	convertedTime= '00'+convertedTime
+  }
+	else
+	convertedTime= time.substr(0, 2)+convertedTime
+  }
+  else{
+	if(time.charAt(0)==='1' && time.charAt(1)==='2'){
+	convertedTime= '12'+convertedTime
+	}
+	else{     
+	let a = time.substr(0, 2)
+	let b = Number(a)
+	let c = (b+12)+''
+	convertedTime= c+convertedTime        
+	}
+  } 
+  return convertedTime
+  }
\ No newline at end of file
diff --git a/test/timeConversion.test.js b/test/timeConversion.test.js
new file mode 100644
index 00000000..1a6cee8c
--- /dev/null
+++ b/test/timeConversion.test.js
@@ -0,0 +1,16 @@
+import test from 'ava'
+import timeConversions from '../src/timeConversion'
+
+test('returns the time in 24 hours format', time => {
+    const timeGiven = "01:12:48AM"
+    const expectedTime = "01:12:48"
+    const actualTime = timeConversions(timeGiven)
+    time.is(actualTime, expectedTime)
+  })
+
+  test('returns the time in 24 hours format', time => {
+    const timeGiven = "06:48:56PM"
+    const expectedTime = "18:48:56"
+    const actualTime = timeConversions(timeGiven)
+    time.is(actualTime, expectedTime)
+  })  
\ No newline at end of file