diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0792e77..2c7c084 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="true" project-jdk-name="13.0.1" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="13.0.1" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/RefactoringAssignment.iml b/RefactoringAssignment.iml
index 7e880ab..454125c 100644
--- a/RefactoringAssignment.iml
+++ b/RefactoringAssignment.iml
@@ -24,5 +24,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13.1/junit-4.13.1.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java
index 558e0a0..516ca40 100644
--- a/src/InsuranceCalculator.java
+++ b/src/InsuranceCalculator.java
@@ -1,15 +1,21 @@
 public class InsuranceCalculator {
-
+    private InsuranceStrategy strategy;
     public double calculateInsurance(double income) {
+
         if (income <= 10000) {
-            return income*0.365;
-        } else if (income <= 30000) {
-            return (income-10000)*0.2+35600;
-        } else if (income <= 60000) {
-            return (income-30000)*0.1+76500;
+            strategy = new InsuranceStrategyLow();
+            return strategy.calculate(income);
+        } else if (income <= 36500) {
+            strategy = new InsuranceStrategyMedium();
+            return strategy.calculate(income);
+        } else if (income <= 70000) {
+            strategy = new InsuranceStrategyHigh();
+            return strategy.calculate(income);
         } else {
-            return (income-60000)*0.02+105600;
+            strategy = new InsuranceStrategyVeryHigh();
+            return strategy.calculate(income);
         }
+
     }
 
 }
diff --git a/src/InsuranceStrategy.java b/src/InsuranceStrategy.java
new file mode 100644
index 0000000..084e03a
--- /dev/null
+++ b/src/InsuranceStrategy.java
@@ -0,0 +1,9 @@
+public abstract class InsuranceStrategy {
+    public double calculate(double income) {
+        return (income - getAdjustment()) * getWeight() + getConstant();
+    }
+
+    public abstract int getConstant();
+    public abstract double getWeight();
+    public abstract int getAdjustment();
+}
diff --git a/src/InsuranceStrategyHigh.java b/src/InsuranceStrategyHigh.java
new file mode 100644
index 0000000..ad6bdfa
--- /dev/null
+++ b/src/InsuranceStrategyHigh.java
@@ -0,0 +1,13 @@
+public class InsuranceStrategyHigh extends InsuranceStrategy {
+    public InsuranceStrategyHigh() { }
+    @Override
+    public int getConstant() { return 70000; }
+
+    @Override
+    public double getWeight() { return 0.18; }
+
+    @Override
+    public int getAdjustment() {
+        return 25000;
+    }
+}
diff --git a/src/InsuranceStrategyLow.java b/src/InsuranceStrategyLow.java
new file mode 100644
index 0000000..576e0df
--- /dev/null
+++ b/src/InsuranceStrategyLow.java
@@ -0,0 +1,16 @@
+public class InsuranceStrategyLow extends InsuranceStrategy {
+    public InsuranceStrategyLow() { }
+
+    @Override
+    public int getConstant() { return 30000; }
+
+    @Override
+    public double getWeight() {
+        return 0.36;
+    }
+
+    @Override
+    public int getAdjustment() {
+        return 5000;
+    }
+}
diff --git a/src/InsuranceStrategyMedium.java b/src/InsuranceStrategyMedium.java
new file mode 100644
index 0000000..f08fafe
--- /dev/null
+++ b/src/InsuranceStrategyMedium.java
@@ -0,0 +1,15 @@
+public class InsuranceStrategyMedium extends InsuranceStrategy {
+    public InsuranceStrategyMedium() { }
+    @Override
+    public int getConstant() { return 35600; }
+
+    @Override
+    public double getWeight() {
+        return 0.2;
+    }
+
+    @Override
+    public int getAdjustment() {
+        return 10000;
+    }
+}
diff --git a/src/InsuranceStrategyVeryHigh.java b/src/InsuranceStrategyVeryHigh.java
new file mode 100644
index 0000000..6bb4519
--- /dev/null
+++ b/src/InsuranceStrategyVeryHigh.java
@@ -0,0 +1,15 @@
+public class InsuranceStrategyVeryHigh extends InsuranceStrategy {
+    public InsuranceStrategyVeryHigh() { }
+    @Override
+    public int getConstant() {
+        return 105600;
+    }
+    @Override
+    public double getWeight() {
+        return 0.02;
+    }
+    @Override
+    public int getAdjustment() {
+        return 60000;
+    }
+}
diff --git a/test/InsuranceTest.java b/test/InsuranceTest.java
new file mode 100644
index 0000000..456c2db
--- /dev/null
+++ b/test/InsuranceTest.java
@@ -0,0 +1,29 @@
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+public class InsuranceTest {
+    @Test
+    public void low() {
+        assertEquals(30000, insuranceFor(5000), 0.01);
+    }
+
+    @Test
+    public void medium() {
+        assertEquals(38600, insuranceFor(25000), 0.01);
+    }
+
+    @Test
+    public void high() {
+        assertEquals(74500, insuranceFor(50000), 0.01);
+    }
+
+    @Test
+    public void veryHigh() {
+        assertEquals(106400, insuranceFor(100_000), 0.01);
+    }
+
+    private double insuranceFor(double income) {
+        return new InsuranceCalculator().calculateInsurance(income);
+    }
+
+}