diff --git a/07_tempConversion/tempConversion.js b/07_tempConversion/tempConversion.js
index 6ef3e85..af64e7c 100644
--- a/07_tempConversion/tempConversion.js
+++ b/07_tempConversion/tempConversion.js
@@ -1,9 +1,11 @@
-const ftoc = function() {
-
+const ftoc = function(f) {
+  celcius = ((f - 32) * 5) / 9;
+  return Math.round(celcius * 10) / 10;
 };
 
-const ctof = function() {
-
+const ctof = function(c) {
+  fahrenheit = ((c * 9) / 5) + 32;
+  return Math.round(fahrenheit * 10) / 10;
 };
 
 // Do not edit below this line
diff --git a/07_tempConversion/tempConversion.spec.js b/07_tempConversion/tempConversion.spec.js
index 93679cc..b1b82f2 100644
--- a/07_tempConversion/tempConversion.spec.js
+++ b/07_tempConversion/tempConversion.spec.js
@@ -4,22 +4,22 @@ describe('ftoc', () => {
   test('works', () => {
     expect(ftoc(32)).toEqual(0);
   });
-  test.skip('rounds to 1 decimal', () => {
+  test('rounds to 1 decimal', () => {
     expect(ftoc(100)).toEqual(37.8);
   });
-  test.skip('works with negatives', () => {
+  test('works with negatives', () => {
     expect(ftoc(-100)).toEqual(-73.3);
   });
 });
 
 describe('ctof', () => {
-  test.skip('works', () => {
+  test('works', () => {
     expect(ctof(0)).toEqual(32);
   });
-  test.skip('rounds to 1 decimal', () => {
+  test('rounds to 1 decimal', () => {
     expect(ctof(73.2)).toEqual(163.8);
   });
-  test.skip('works with negatives', () => {
+  test('works with negatives', () => {
     expect(ctof(-10)).toEqual(14);
   });
 });