From a5e2c84ea570680e189bdceabf4231e95bb61262 Mon Sep 17 00:00:00 2001
From: Karousha Fennimore <karousha@gmail.com>
Date: Sun, 11 Mar 2018 12:40:31 -0400
Subject: [PATCH 1/3] still working on p3

---
 .idea/.name                                   |   1 +
 .idea/compiler.xml                            |  16 +
 .idea/libraries/Maven__junit_junit_4_12.xml   |  13 +
 .../Maven__org_hamcrest_hamcrest_core_1_3.xml |  13 +
 .idea/misc.xml                                |  13 +
 .idea/modules.xml                             |   8 +
 .idea/uiDesigner.xml                          | 124 +++
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 755 ++++++++++++++++++
 generics.iml                                  |  16 +
 pom.xml                                       |   4 +-
 src/main/java/.deleteme                       |   0
 src/main/java/MyArrayList.java                |  78 ++
 src/main/java/MyMap.java                      |  83 ++
 src/main/java/MySet.java                      |  49 ++
 src/test/java/.deleteme                       |   0
 src/test/java/myArrayListTest.java            | 426 ++++++++++
 src/test/java/myMapTest.java                  | 102 +++
 src/test/java/mySetTest.java                  | 241 ++++++
 19 files changed, 1946 insertions(+), 2 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 generics.iml
 delete mode 100644 src/main/java/.deleteme
 create mode 100644 src/main/java/MyArrayList.java
 create mode 100644 src/main/java/MyMap.java
 create mode 100644 src/main/java/MySet.java
 delete mode 100644 src/test/java/.deleteme
 create mode 100644 src/test/java/myArrayListTest.java
 create mode 100644 src/test/java/myMapTest.java
 create mode 100644 src/test/java/mySetTest.java

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..1f58a0f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+generics
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..3c8658d
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="generics" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="generics" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..e8942bd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ca63f44
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/generics.iml" filepath="$PROJECT_DIR$/generics.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8914f09
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,755 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="0221460d-f0a0-4dbf-b417-e5639df829f0" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/.deleteme" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/.deleteme" afterPath="" />
+    </list>
+    <ignored path="$PROJECT_DIR$/target/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="565">
+              <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
+              <folding>
+                <element signature="e#111#112#0" expanded="true" />
+                <element signature="e#159#160#0" expanded="true" />
+                <element signature="e#194#195#0" expanded="true" />
+                <element signature="e#245#246#0" expanded="true" />
+                <element signature="e#426#427#0" expanded="true" />
+                <element signature="e#469#470#0" expanded="true" />
+                <element signature="e#499#500#0" expanded="true" />
+                <element signature="e#539#540#0" expanded="true" />
+                <element signature="e#563#564#0" expanded="true" />
+                <element signature="e#603#604#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="myMapTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/myMapTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="90">
+              <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MyMap.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MySet.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="109">
+              <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+              <folding>
+                <element signature="e#80#81#0" expanded="true" />
+                <element signature="e#123#124#0" expanded="true" />
+                <element signature="e#269#270#0" expanded="true" />
+                <element signature="e#304#305#0" expanded="true" />
+                <element signature="e#335#336#0" expanded="true" />
+                <element signature="e#374#375#0" expanded="true" />
+                <element signature="e#477#478#0" expanded="true" />
+                <element signature="e#512#513#0" expanded="true" />
+                <element signature="e#550#551#0" expanded="true" />
+                <element signature="e#592#593#0" expanded="true" />
+                <element signature="e#619#620#0" expanded="true" />
+                <element signature="e#648#649#0" expanded="true" />
+                <element signature="e#680#681#0" expanded="true" />
+                <element signature="e#718#719#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="mySetTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/mySetTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="182" column="34" lean-forward="true" selection-start-line="182" selection-start-column="34" selection-end-line="182" selection-end-column="34" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="myArrayListTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="460">
+              <caret line="419" column="52" lean-forward="false" selection-start-line="419" selection-start-column="52" selection-end-line="419" selection-end-column="52" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="FxmlFile" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/main/java/UnitTestingUtils.java" />
+        <option value="$PROJECT_DIR$/src/test/java/UnitTestingUtils.java" />
+        <option value="$PROJECT_DIR$/src/test/java/addTest.java" />
+        <option value="$PROJECT_DIR$/src/test/java/removeTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/ArrayUtility.java" />
+        <option value="$PROJECT_DIR$/src/test/java/myArrayLIstTest.java" />
+        <option value="$PROJECT_DIR$/src/test/java/myArrayListTest" />
+        <option value="$PROJECT_DIR$/src/test/java/removeTests.java" />
+        <option value="$PROJECT_DIR$/src/test/java/addTests.java" />
+        <option value="$PROJECT_DIR$/src/test/java/mySetTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
+        <option value="$PROJECT_DIR$/src/test/java/myMapTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/test/java/myArrayListTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="y" value="23" />
+    <option name="width" value="1440" />
+    <option name="height" value="797" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scratches" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RecentsManager">
+    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name="" />
+    </key>
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="" />
+    </key>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="JUnit.mySetTest">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <module />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="myArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="myArrayListTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="myMapTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="myMapTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="myMapTest.sizeIntTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="myMapTest" />
+      <option name="METHOD_NAME" value="sizeIntTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="mySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="mySetTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="mySetTest.add" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="mySetTest" />
+      <option name="METHOD_NAME" value="add" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <list size="5">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.myArrayListTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.mySetTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.mySetTest.add" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.myMapTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.myMapTest.sizeIntTest" />
+    </list>
+    <recent_temporary>
+      <list size="5">
+        <item index="0" class="java.lang.String" itemvalue="JUnit.mySetTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.myArrayListTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.myMapTest.sizeIntTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.myMapTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.mySetTest.add" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="0221460d-f0a0-4dbf-b417-e5639df829f0" name="Default" comment="" />
+      <created>1520602232939</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1520602232939</updated>
+      <workItem from="1520602234369" duration="2374000" />
+      <workItem from="1520628743410" duration="18963000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="myArrayListTest - 2018.03.11 at 12h 37m 18s.xml">
+      <configuration name="myArrayListTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="myMapTest - 2018.03.11 at 12h 24m 35s.xml">
+      <configuration name="myMapTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="myMapTest_sizeIntTest - 2018.03.11 at 12h 25m 21s.xml">
+      <configuration name="myMapTest.sizeIntTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 11h 45m 10s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 11h 46m 32s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 11h 50m 22s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 12h 07m 24s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 12h 08m 31s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 12h 09m 16s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="mySetTest - 2018.03.11 at 12h 37m 26s.xml">
+      <configuration name="mySetTest" configurationId="JUnit" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="21337000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="23" width="1440" height="797" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2532189" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="5" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#111#112#0" expanded="true" />
+            <element signature="e#159#160#0" expanded="true" />
+            <element signature="e#194#195#0" expanded="true" />
+            <element signature="e#245#246#0" expanded="true" />
+            <element signature="e#426#427#0" expanded="true" />
+            <element signature="e#469#470#0" expanded="true" />
+            <element signature="e#499#500#0" expanded="true" />
+            <element signature="e#539#540#0" expanded="true" />
+            <element signature="e#563#564#0" expanded="true" />
+            <element signature="e#603#604#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/removeTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="23" lean-forward="false" selection-start-line="0" selection-start-column="23" selection-end-line="0" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/addTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/UnitTestingUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ArrayUtility.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="22" lean-forward="true" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/ArrayUtility.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="10" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/addTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/UnitTestingUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="43" lean-forward="false" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/removeTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="60" column="2" lean-forward="true" selection-start-line="60" selection-start-column="2" selection-end-line="60" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/Arrays.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21270">
+          <caret line="1450" column="7" lean-forward="true" selection-start-line="1450" selection-start-column="7" selection-end-line="1450" selection-end-column="7" />
+          <folding>
+            <element signature="e#0#227755#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1756">
+          <caret line="495" column="8" lean-forward="false" selection-start-line="495" selection-start-column="8" selection-end-line="507" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+          <folding>
+            <element signature="e#80#81#0" expanded="true" />
+            <element signature="e#123#124#0" expanded="true" />
+            <element signature="e#269#270#0" expanded="true" />
+            <element signature="e#304#305#0" expanded="true" />
+            <element signature="e#335#336#0" expanded="true" />
+            <element signature="e#374#375#0" expanded="true" />
+            <element signature="e#477#478#0" expanded="true" />
+            <element signature="e#512#513#0" expanded="true" />
+            <element signature="e#550#551#0" expanded="true" />
+            <element signature="e#592#593#0" expanded="true" />
+            <element signature="e#619#620#0" expanded="true" />
+            <element signature="e#648#649#0" expanded="true" />
+            <element signature="e#680#681#0" expanded="true" />
+            <element signature="e#718#719#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="565">
+          <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
+          <folding>
+            <element signature="e#111#112#0" expanded="true" />
+            <element signature="e#159#160#0" expanded="true" />
+            <element signature="e#194#195#0" expanded="true" />
+            <element signature="e#245#246#0" expanded="true" />
+            <element signature="e#426#427#0" expanded="true" />
+            <element signature="e#469#470#0" expanded="true" />
+            <element signature="e#499#500#0" expanded="true" />
+            <element signature="e#539#540#0" expanded="true" />
+            <element signature="e#563#564#0" expanded="true" />
+            <element signature="e#603#604#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="460">
+          <caret line="419" column="52" lean-forward="false" selection-start-line="419" selection-start-column="52" selection-end-line="419" selection-end-column="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/mySetTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="182" column="34" lean-forward="true" selection-start-line="182" selection-start-column="34" selection-end-line="182" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/myMapTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/generics.iml b/generics.iml
new file mode 100644
index 0000000..ea9ab4f
--- /dev/null
+++ b/generics.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 73be9cd..4e601ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/.deleteme b/src/main/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
new file mode 100644
index 0000000..a3669d3
--- /dev/null
+++ b/src/main/java/MyArrayList.java
@@ -0,0 +1,78 @@
+import java.util.Arrays;
+
+
+public class MyArrayList <K>{
+
+    private K[] inputArray;
+
+    public MyArrayList(){
+        inputArray = (K[]) new Object[0];
+    }
+
+    public MyArrayList(int size){
+        inputArray = (K[]) new Object[size];
+    }
+
+    public <K> K[] toArray(K[] newArray){
+        return (K[]) Arrays.copyOf(inputArray, inputArray.length, newArray.getClass());
+    }
+
+    public void set(int index, K element){
+        inputArray[index] = element;
+    }
+
+    public K get(int index){
+        return inputArray[index];
+    }
+
+    public int size(){
+        return inputArray.length;
+    }
+
+    public void add(K obj){
+
+        K[] addArray = Arrays.copyOf(inputArray, inputArray.length + 1);
+        addArray[addArray.length - 1] = obj;
+        inputArray = addArray;
+    }
+
+    public void add(int index, K obj) {
+
+        inputArray = Arrays.copyOf(inputArray, inputArray.length + 1);
+
+        for (int i = inputArray.length - 1; i > index; i--){
+            inputArray[i] = inputArray[i-1];
+            }
+            inputArray[index]= obj;
+    }
+
+
+    public void remove(int index){
+
+        for (int i = index; i < inputArray.length - 1; i++){
+            inputArray[i] = inputArray[i + 1] ;
+            }
+        inputArray = Arrays.copyOf(inputArray, inputArray.length - 1);
+    }
+
+    public void clear() {
+        //reassigned it to an empty array
+        inputArray = (K[]) new Object[0];
+    }
+
+    public boolean isEmpty(){
+        if (inputArray.length == 0) {
+            return true;
+        }else
+            return false;
+    }
+
+    public boolean contains(K value) {
+        for (int i = 0; i < inputArray.length; i++) {
+            if (value.equals(inputArray[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/MyMap.java b/src/main/java/MyMap.java
new file mode 100644
index 0000000..2f67099
--- /dev/null
+++ b/src/main/java/MyMap.java
@@ -0,0 +1,83 @@
+//public class MyMap <K>{
+//
+//    private MyMap<K> myMap;
+//
+//    public MyMap() {
+//        myMap = new MyArrayList<>();
+//    }
+//
+//    public MyMap(MyArrayList<K> myMap) {
+//        this.myMap = myMap;
+//    }
+//
+//    public int size() {
+//        return myMap.size();
+//    }
+//
+//    public boolean isEmpty() {
+//        return myMap.isEmpty();
+//    }
+//
+//    public boolean containsKey(K key){
+//        if (myMap.contains(key)) {
+//            return true;
+//        }else
+//            return false;
+//    }
+//
+//    public boolean containsValue(K key, K value){
+//        if(myMap.contains(key)) {
+//            return true;
+//        }else
+//            return false;
+//    }
+//
+//    public K get(int index) {
+//        return myMap.get(index);
+//    }
+//
+//    public void put(K key, K value){
+//        if (!myMap.contains(key)) {
+//            myMap.add(key);
+//        }
+//    }
+//
+//    public void putAll(K key, K value){
+//        if (!myMap.contains(key)) {
+//            myMap.add(key);
+//        }
+//    }
+//
+//    public void remove(int index) {
+//        myMap.remove(index);
+//    }
+//
+//    public void clear() {
+//        myMap.clear();
+//    }
+//
+//    public void keySet(int index, K obj){
+//        myMap.set(index, obj);
+//    }
+//
+//    public void entrySet(int index, K obj){
+//        myMap.set(index, obj);
+//    }
+//
+//
+//    public void values(){
+//    }
+//
+//    public void equals(){
+//    }
+//
+//    public int hashCode(){
+//        return myMap.hashCode();
+//    }
+//
+//
+//
+//
+//
+//
+//}
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
new file mode 100644
index 0000000..d0ddbfa
--- /dev/null
+++ b/src/main/java/MySet.java
@@ -0,0 +1,49 @@
+public class MySet <K> {
+
+    private MyArrayList<K> mySet;
+
+    public MySet() {
+        mySet = new MyArrayList<>();
+    }
+
+    public void add(K obj){
+        if (!mySet.contains(obj)) {
+            mySet.add(obj);
+        }
+    }
+
+    public void remove(int index) {
+        mySet.remove(index);
+    }
+
+    public K get(int index) {
+        return mySet.get(index);
+    }
+
+    public void set(int index, K obj){
+
+        mySet.set(index, obj);
+    }
+
+    public int size() {
+        return mySet.size();
+    }
+
+    public boolean contains (K obj){
+        return mySet.contains(obj);
+    }
+
+    public void clear() {
+        mySet.clear();
+    }
+
+    public boolean isEmpty() {
+        return mySet.isEmpty();
+    }
+
+
+//    public K[] toArray(K[] values) {
+//        return (K[]) Arrays.copyOf(mySet, inputArray.length, newArray.getClass());
+//
+//    }
+}
diff --git a/src/test/java/.deleteme b/src/test/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/java/myArrayListTest.java b/src/test/java/myArrayListTest.java
new file mode 100644
index 0000000..31a7d4b
--- /dev/null
+++ b/src/test/java/myArrayListTest.java
@@ -0,0 +1,426 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class myArrayListTest {
+
+    @Test
+    public void addLongTest() {
+        //Given
+        MyArrayList<Long> myArrayList = new MyArrayList<>();
+        Long valueToAdd = 4L;
+        myArrayList.add(1L);
+        myArrayList.add(2L);
+        myArrayList.add(3L);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(5L);
+        myArrayList.add(6L);
+
+        //When
+        Long[] expected = {1L, 2L, 3L, 4L, 5L, 6L};
+        Long[] actual = myArrayList.toArray(new Long[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void addStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        String valueToAdd = "Paxton";
+        myArrayList.add("Kay");
+        myArrayList.add(valueToAdd);
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add(valueToAdd);
+        myArrayList.add(valueToAdd);
+
+        //When
+        String[] expected = {"Kay", "Paxton", "Joseph", "Elisha", "Paxton", "Paxton"};
+        String[] actual = myArrayList.toArray(new String[0]);
+
+        // Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void addIntegerTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        Integer valueToAdd = 12;
+        myArrayList.add(2);
+        myArrayList.add(9);
+        myArrayList.add(1);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(0);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(4);
+        myArrayList.add(valueToAdd);
+
+        // When
+        Integer[] expected = {2, 9, 1, 12, 12, 0, 12, 4, 12};
+        Integer[] actual = myArrayList.toArray(new Integer[0]);
+
+        // Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void sizeTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        Integer valueToAdd = 12;
+        myArrayList.add(2);
+        myArrayList.add(9);
+        myArrayList.add(1);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(0);
+        myArrayList.add(valueToAdd);
+        myArrayList.add(4);
+        myArrayList.add(valueToAdd);
+
+        //When
+        int expected = 9;
+        int actual = myArrayList.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void sizeStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        String valueToAdd = "Paxton";
+        myArrayList.add("Kay");
+        myArrayList.add(valueToAdd);
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add(valueToAdd);
+        myArrayList.add(valueToAdd);
+
+        //When
+        int expected = 6;
+        int actual = myArrayList.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void setIntTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.set(1, 8);
+        myArrayList.add(4);
+
+        //When
+        Integer[] expected = {0, 8, 2, 3, 4};
+        Integer[] actual = myArrayList.toArray(new Integer[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void setStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+        myArrayList.add("Kay");
+        myArrayList.add("Paxton");
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add("Nico");
+        myArrayList.set(0, "Paxton");
+
+        //When
+        String[] expected = {"Paxton", "Paxton", "Joseph", "Elisha", "Nico"};
+        String[] actual = myArrayList.toArray(new String[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+
+
+    @Test
+    public void addIndexTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+        myArrayList.add(0,7);
+
+        //When
+        Integer[] expected = {7, 0, 1, 2, 3, 4};
+        Integer[] actual = myArrayList.toArray(new Integer[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void addStringIndexTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Kay");
+        myArrayList.add("Paxton");
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add("Nico");
+        myArrayList.add(0, "Paxton");
+
+        //When
+        String[] expected = {"Paxton", "Kay", "Paxton", "Joseph", "Elisha", "Nico"};
+        String[] actual = myArrayList.toArray(new String[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void toArrayIntTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+
+        //When
+        Integer[] expected = {0, 1, 2, 3, 4};
+        Integer[] actual = myArrayList.toArray(new Integer[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void toArrayStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Kay");
+        myArrayList.add("Paxton");
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add("Nico");
+
+        //When
+        String[] expected = {"Kay", "Paxton", "Joseph", "Elisha", "Nico"};
+        String[] actual = myArrayList.toArray(new String[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void getIndexIntTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+
+        //When
+        Integer expected = 3;
+        Integer actual = myArrayList.get(3);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void getIndexStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Kay");
+        myArrayList.add("Paxton");
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add("Nico");
+
+        //When
+        String expected = "Paxton";
+        String actual = myArrayList.get(1);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void removeIntTest(){
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+        myArrayList.remove(0);
+
+        //When
+        Integer[] expected = {1, 2, 3, 4};
+        Integer[] actual = myArrayList.toArray(new Integer[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void removeStringTest(){
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Kay");
+        myArrayList.add("Paxton");
+        myArrayList.add("Joseph");
+        myArrayList.add("Elisha");
+        myArrayList.add("Nico");
+        myArrayList.remove(2);
+
+        //When
+        String[] expected = {"Kay", "Paxton", "Elisha", "Nico"};
+        String[] actual = myArrayList.toArray(new String[0]);
+
+        //Then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void clearTest(){
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+
+        //When
+        myArrayList.clear();
+
+        int expected = 0;
+        int actual = myArrayList.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void clearStringTest(){
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Hello");
+        myArrayList.add("There");
+        myArrayList.add("Big");
+        myArrayList.add("World");
+
+        //When
+        myArrayList.clear();
+
+        int expected = 0;
+        int actual = myArrayList.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmptyTest() {
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(0);
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+        myArrayList.clear();
+
+        //When
+        boolean expected = true;
+        boolean actual = myArrayList.isEmpty();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmptyStringTest() {
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Hello");
+        myArrayList.add("There");
+        myArrayList.add("Big");
+        myArrayList.add("World");
+
+        //When
+        boolean expected = false;
+        boolean actual = myArrayList.isEmpty();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void containsTest(){
+        //Given
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+
+        myArrayList.add(1);
+        myArrayList.add(2);
+        myArrayList.add(3);
+        myArrayList.add(4);
+
+        //When
+        boolean expected = false;
+        boolean actual = myArrayList.contains(5);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void containsStringTest(){
+        //Given
+        MyArrayList<String> myArrayList = new MyArrayList<>();
+
+        myArrayList.add("Hello");
+        myArrayList.add("There");
+        myArrayList.add("Big");
+        myArrayList.add("World");
+
+        //When
+        boolean expected = true;
+        boolean actual = myArrayList.contains("World");
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+}
+
diff --git a/src/test/java/myMapTest.java b/src/test/java/myMapTest.java
new file mode 100644
index 0000000..80e5606
--- /dev/null
+++ b/src/test/java/myMapTest.java
@@ -0,0 +1,102 @@
+//import org.junit.Assert;
+//import org.junit.Test;
+//
+//public class myMapTest {
+//
+//    @Test
+//    public void sizeIntTest() {
+//        //Given
+//        MyMap<Integer> testMap = new MyMap<>();
+//        testMap.put(1);
+//        testMap.put(2);
+//        testMap.put(3);
+//        testMap.put(4);
+//
+//        //When
+//        int expected = 4;
+//        int actual = testMap.size();
+//
+//        //Then
+//        Assert.assertEquals(expected, actual);
+//    }
+//
+//    @Test
+//    public void isEmpty() {
+//        //Given
+//        MyMap<Integer> testSet = new MyMap<>();
+//        testSet.put(1);
+//        testSet.put(2);
+//        testSet.put(3);
+//
+//        //When
+//        boolean expected = false;
+//        boolean actual = testSet.isEmpty();
+//
+//        Assert.assertEquals(expected,actual);
+//    }
+//    }
+//
+//    @Test
+//    public void containsKey() {
+//    }
+//
+//    @Test
+//    public void containsValue() {
+//    }
+//
+//    @Test
+//    public void get() {
+//    }
+//
+//    @Test
+//    public void put() {
+//    }
+//
+//    @Test
+//    public void putAll() {
+//    }
+//
+//    @Test
+//    public void remove() {
+//    }
+//
+//    @Test
+//    public void clear() {
+//        //Given
+//        MyMap<Integer> testSet = new MyMap<>();
+//        testSet.put(1);
+//        testSet.put(2);
+//        testSet.put(3);
+//
+//        //When
+//        testSet.clear();
+//
+//        int expected = 0;
+//        int actual = testSet.size();
+//
+//        //Then
+//        Assert.assertEquals(expected,actual);
+//    }
+//
+//    @Test
+//    public void keySet() {
+//    }
+//
+//    @Test
+//    public void entrySet() {
+//    }
+//
+//    @Test
+//    public void values() {
+//    }
+//
+//    @Test
+//    public void equals() {
+//    }
+//
+//    @Test
+//    public int hashCode() {
+//
+//        return 0;
+//    }
+//}
diff --git a/src/test/java/mySetTest.java b/src/test/java/mySetTest.java
new file mode 100644
index 0000000..a2616c3
--- /dev/null
+++ b/src/test/java/mySetTest.java
@@ -0,0 +1,241 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class mySetTest {
+
+    @Test
+    public void addIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(2);
+        testSet.add(9);
+        testSet.add(1);
+        testSet.add(0);
+        testSet.add(4);
+
+        //When
+        int expected = 5;
+        int actual = testSet.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        int expected = 3;
+        int actual = testSet.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(2);
+        testSet.add(9);
+        testSet.add(1);
+        testSet.add(0);
+        testSet.add(4);
+
+        //When
+        int expected = 0;
+        int actual = testSet.get(3);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        String expected = "Pax";
+        String actual = testSet.get(0);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(2);
+        testSet.add(9);
+        testSet.add(1);
+        testSet.add(0);
+        testSet.add(4);
+
+        //When
+        testSet.remove(3);
+
+        int expected = 4;
+        int actual = testSet.size();
+
+        //THen
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void removeStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        testSet.remove(2);
+
+        int expected = 2;
+        int actual = testSet.size();
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
+    @Test
+    public void setIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(1);
+        testSet.add(2);
+        testSet.add(3);
+
+        //When
+        testSet.set(1, 4);
+
+        int expected = 4;
+        int actual = testSet.get(1);
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void setStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        testSet.set(2, "hello");
+
+        String expected = "hello";
+        String actual = testSet.get(2);
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
+    @Test
+    public void clearIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(1);
+        testSet.add(2);
+        testSet.add(3);
+
+        //When
+        testSet.clear();
+
+        int expected = 0;
+        int actual = testSet.size();
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void clearStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        testSet.clear();
+
+        int expected = 0;
+        int actual = testSet.size();
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void isEmptyIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(1);
+        testSet.add(2);
+        testSet.add(3);
+
+        //When
+        boolean expected = false;
+        boolean actual = testSet.isEmpty();
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void isEmptyStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        //When
+        testSet.clear();
+
+        boolean expected = true;
+        boolean actual = testSet.isEmpty();
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void containsIntTest() {
+        //Given
+        MySet<Integer> testSet = new MySet<>();
+        testSet.add(1);
+        testSet.add(2);
+        testSet.add(3);
+
+        boolean expected = false;
+        boolean actual = testSet.contains(5);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void containsStringTest() {
+        //Given
+        MySet<String> testSet = new MySet<>();
+        testSet.add("Pax");
+        testSet.add("Joe");
+        testSet.add("Kay");
+
+        boolean expected = true;
+        boolean actual = testSet.contains("Pax");
+
+        Assert.assertEquals(expected,actual);
+    }
+}

From 0791eabb26f9e38510a6473bb3f574ab52be0121 Mon Sep 17 00:00:00 2001
From: Karousha Fennimore <karousha@gmail.com>
Date: Sun, 11 Mar 2018 12:55:41 -0400
Subject: [PATCH 2/3] still working

---
 .idea/workspace.xml                | 182 ++++++++++++++++++-----------
 src/main/java/MyArrayList.java     |   2 +-
 src/main/java/MyMap.java           | 164 +++++++++++++-------------
 src/main/java/MySet.java           |   2 +-
 src/test/java/myArrayListTest.java |  42 +++----
 5 files changed, 216 insertions(+), 176 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8914f09..b670a4e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0221460d-f0a0-4dbf-b417-e5639df829f0" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/.deleteme" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/.deleteme" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyMap.java" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/myArrayListTest.java" afterPath="$PROJECT_DIR$/src/test/java/myArrayListTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,16 +23,16 @@
             <state relative-caret-position="565">
               <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
               <folding>
-                <element signature="e#111#112#0" expanded="true" />
-                <element signature="e#159#160#0" expanded="true" />
-                <element signature="e#194#195#0" expanded="true" />
-                <element signature="e#245#246#0" expanded="true" />
-                <element signature="e#426#427#0" expanded="true" />
-                <element signature="e#469#470#0" expanded="true" />
-                <element signature="e#499#500#0" expanded="true" />
-                <element signature="e#539#540#0" expanded="true" />
-                <element signature="e#563#564#0" expanded="true" />
-                <element signature="e#603#604#0" expanded="true" />
+                <element signature="e#114#115#0" expanded="true" />
+                <element signature="e#162#163#0" expanded="true" />
+                <element signature="e#197#198#0" expanded="true" />
+                <element signature="e#248#249#0" expanded="true" />
+                <element signature="e#429#430#0" expanded="true" />
+                <element signature="e#472#473#0" expanded="true" />
+                <element signature="e#502#503#0" expanded="true" />
+                <element signature="e#542#543#0" expanded="true" />
+                <element signature="e#566#567#0" expanded="true" />
+                <element signature="e#606#607#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -51,9 +51,30 @@
       <file leaf-file-name="MyMap.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-              <folding />
+            <state relative-caret-position="202">
+              <caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
+              <folding>
+                <element signature="e#218#219#0" expanded="true" />
+                <element signature="e#255#256#0" expanded="true" />
+                <element signature="e#280#281#0" expanded="true" />
+                <element signature="e#315#316#0" expanded="true" />
+                <element signature="e#347#348#0" expanded="true" />
+                <element signature="e#385#386#0" expanded="true" />
+                <element signature="e#847#848#0" expanded="true" />
+                <element signature="e#880#881#0" expanded="true" />
+                <element signature="e#907#908#0" expanded="true" />
+                <element signature="e#936#937#0" expanded="true" />
+                <element signature="e#1031#1032#0" expanded="true" />
+                <element signature="e#1070#1071#0" expanded="true" />
+                <element signature="e#1136#1137#0" expanded="true" />
+                <element signature="e#1162#1163#0" expanded="true" />
+                <element signature="e#1195#1196#0" expanded="true" />
+                <element signature="e#1225#1226#0" expanded="true" />
+                <element signature="e#1252#1253#0" expanded="true" />
+                <element signature="e#1280#1281#0" expanded="true" />
+                <element signature="e#1317#1318#0" expanded="true" />
+                <element signature="e#1351#1352#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -64,20 +85,20 @@
             <state relative-caret-position="109">
               <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
               <folding>
-                <element signature="e#80#81#0" expanded="true" />
-                <element signature="e#123#124#0" expanded="true" />
-                <element signature="e#269#270#0" expanded="true" />
-                <element signature="e#304#305#0" expanded="true" />
-                <element signature="e#335#336#0" expanded="true" />
-                <element signature="e#374#375#0" expanded="true" />
-                <element signature="e#477#478#0" expanded="true" />
-                <element signature="e#512#513#0" expanded="true" />
-                <element signature="e#550#551#0" expanded="true" />
-                <element signature="e#592#593#0" expanded="true" />
-                <element signature="e#619#620#0" expanded="true" />
-                <element signature="e#648#649#0" expanded="true" />
-                <element signature="e#680#681#0" expanded="true" />
-                <element signature="e#718#719#0" expanded="true" />
+                <element signature="e#83#84#0" expanded="true" />
+                <element signature="e#126#127#0" expanded="true" />
+                <element signature="e#272#273#0" expanded="true" />
+                <element signature="e#307#308#0" expanded="true" />
+                <element signature="e#338#339#0" expanded="true" />
+                <element signature="e#377#378#0" expanded="true" />
+                <element signature="e#480#481#0" expanded="true" />
+                <element signature="e#515#516#0" expanded="true" />
+                <element signature="e#553#554#0" expanded="true" />
+                <element signature="e#595#596#0" expanded="true" />
+                <element signature="e#622#623#0" expanded="true" />
+                <element signature="e#651#652#0" expanded="true" />
+                <element signature="e#683#684#0" expanded="true" />
+                <element signature="e#721#722#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -461,7 +482,7 @@
       <option name="presentableId" value="Default" />
       <updated>1520602232939</updated>
       <workItem from="1520602234369" duration="2374000" />
-      <workItem from="1520628743410" duration="18963000" />
+      <workItem from="1520628743410" duration="19860000" />
     </task>
     <servers />
   </component>
@@ -498,7 +519,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21337000" />
+    <option name="totallyTimeSpent" value="22234000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="797" extended-state="0" />
@@ -551,16 +572,16 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#111#112#0" expanded="true" />
-            <element signature="e#159#160#0" expanded="true" />
-            <element signature="e#194#195#0" expanded="true" />
-            <element signature="e#245#246#0" expanded="true" />
-            <element signature="e#426#427#0" expanded="true" />
-            <element signature="e#469#470#0" expanded="true" />
-            <element signature="e#499#500#0" expanded="true" />
-            <element signature="e#539#540#0" expanded="true" />
-            <element signature="e#563#564#0" expanded="true" />
-            <element signature="e#603#604#0" expanded="true" />
+            <element signature="e#114#115#0" expanded="true" />
+            <element signature="e#162#163#0" expanded="true" />
+            <element signature="e#197#198#0" expanded="true" />
+            <element signature="e#248#249#0" expanded="true" />
+            <element signature="e#429#430#0" expanded="true" />
+            <element signature="e#472#473#0" expanded="true" />
+            <element signature="e#502#503#0" expanded="true" />
+            <element signature="e#542#543#0" expanded="true" />
+            <element signature="e#566#567#0" expanded="true" />
+            <element signature="e#606#607#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -662,20 +683,20 @@
         <state relative-caret-position="109">
           <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
           <folding>
-            <element signature="e#80#81#0" expanded="true" />
-            <element signature="e#123#124#0" expanded="true" />
-            <element signature="e#269#270#0" expanded="true" />
-            <element signature="e#304#305#0" expanded="true" />
-            <element signature="e#335#336#0" expanded="true" />
-            <element signature="e#374#375#0" expanded="true" />
-            <element signature="e#477#478#0" expanded="true" />
-            <element signature="e#512#513#0" expanded="true" />
-            <element signature="e#550#551#0" expanded="true" />
-            <element signature="e#592#593#0" expanded="true" />
-            <element signature="e#619#620#0" expanded="true" />
-            <element signature="e#648#649#0" expanded="true" />
-            <element signature="e#680#681#0" expanded="true" />
-            <element signature="e#718#719#0" expanded="true" />
+            <element signature="e#83#84#0" expanded="true" />
+            <element signature="e#126#127#0" expanded="true" />
+            <element signature="e#272#273#0" expanded="true" />
+            <element signature="e#307#308#0" expanded="true" />
+            <element signature="e#338#339#0" expanded="true" />
+            <element signature="e#377#378#0" expanded="true" />
+            <element signature="e#480#481#0" expanded="true" />
+            <element signature="e#515#516#0" expanded="true" />
+            <element signature="e#553#554#0" expanded="true" />
+            <element signature="e#595#596#0" expanded="true" />
+            <element signature="e#622#623#0" expanded="true" />
+            <element signature="e#651#652#0" expanded="true" />
+            <element signature="e#683#684#0" expanded="true" />
+            <element signature="e#721#722#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -685,16 +706,16 @@
         <state relative-caret-position="565">
           <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
           <folding>
-            <element signature="e#111#112#0" expanded="true" />
-            <element signature="e#159#160#0" expanded="true" />
-            <element signature="e#194#195#0" expanded="true" />
-            <element signature="e#245#246#0" expanded="true" />
-            <element signature="e#426#427#0" expanded="true" />
-            <element signature="e#469#470#0" expanded="true" />
-            <element signature="e#499#500#0" expanded="true" />
-            <element signature="e#539#540#0" expanded="true" />
-            <element signature="e#563#564#0" expanded="true" />
-            <element signature="e#603#604#0" expanded="true" />
+            <element signature="e#114#115#0" expanded="true" />
+            <element signature="e#162#163#0" expanded="true" />
+            <element signature="e#197#198#0" expanded="true" />
+            <element signature="e#248#249#0" expanded="true" />
+            <element signature="e#429#430#0" expanded="true" />
+            <element signature="e#472#473#0" expanded="true" />
+            <element signature="e#502#503#0" expanded="true" />
+            <element signature="e#542#543#0" expanded="true" />
+            <element signature="e#566#567#0" expanded="true" />
+            <element signature="e#606#607#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -729,9 +750,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-          <folding />
+        <state relative-caret-position="202">
+          <caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
+          <folding>
+            <element signature="e#218#219#0" expanded="true" />
+            <element signature="e#255#256#0" expanded="true" />
+            <element signature="e#280#281#0" expanded="true" />
+            <element signature="e#315#316#0" expanded="true" />
+            <element signature="e#347#348#0" expanded="true" />
+            <element signature="e#385#386#0" expanded="true" />
+            <element signature="e#847#848#0" expanded="true" />
+            <element signature="e#880#881#0" expanded="true" />
+            <element signature="e#907#908#0" expanded="true" />
+            <element signature="e#936#937#0" expanded="true" />
+            <element signature="e#1031#1032#0" expanded="true" />
+            <element signature="e#1070#1071#0" expanded="true" />
+            <element signature="e#1136#1137#0" expanded="true" />
+            <element signature="e#1162#1163#0" expanded="true" />
+            <element signature="e#1195#1196#0" expanded="true" />
+            <element signature="e#1225#1226#0" expanded="true" />
+            <element signature="e#1252#1253#0" expanded="true" />
+            <element signature="e#1280#1281#0" expanded="true" />
+            <element signature="e#1317#1318#0" expanded="true" />
+            <element signature="e#1351#1352#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index a3669d3..9e947d1 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -1,7 +1,7 @@
 import java.util.Arrays;
 
 
-public class MyArrayList <K>{
+public class MyArrayList <K, V>{
 
     private K[] inputArray;
 
diff --git a/src/main/java/MyMap.java b/src/main/java/MyMap.java
index 2f67099..9b7ea38 100644
--- a/src/main/java/MyMap.java
+++ b/src/main/java/MyMap.java
@@ -1,83 +1,81 @@
-//public class MyMap <K>{
-//
-//    private MyMap<K> myMap;
-//
-//    public MyMap() {
-//        myMap = new MyArrayList<>();
-//    }
-//
-//    public MyMap(MyArrayList<K> myMap) {
-//        this.myMap = myMap;
-//    }
-//
-//    public int size() {
-//        return myMap.size();
-//    }
-//
-//    public boolean isEmpty() {
-//        return myMap.isEmpty();
-//    }
-//
-//    public boolean containsKey(K key){
-//        if (myMap.contains(key)) {
-//            return true;
-//        }else
-//            return false;
-//    }
-//
-//    public boolean containsValue(K key, K value){
-//        if(myMap.contains(key)) {
-//            return true;
-//        }else
-//            return false;
-//    }
-//
-//    public K get(int index) {
-//        return myMap.get(index);
-//    }
-//
-//    public void put(K key, K value){
-//        if (!myMap.contains(key)) {
-//            myMap.add(key);
-//        }
-//    }
-//
-//    public void putAll(K key, K value){
-//        if (!myMap.contains(key)) {
-//            myMap.add(key);
-//        }
-//    }
-//
-//    public void remove(int index) {
-//        myMap.remove(index);
-//    }
-//
-//    public void clear() {
-//        myMap.clear();
-//    }
-//
-//    public void keySet(int index, K obj){
-//        myMap.set(index, obj);
-//    }
-//
-//    public void entrySet(int index, K obj){
-//        myMap.set(index, obj);
-//    }
-//
-//
-//    public void values(){
-//    }
-//
-//    public void equals(){
-//    }
-//
-//    public int hashCode(){
-//        return myMap.hashCode();
-//    }
-//
-//
-//
-//
-//
-//
-//}
+public class MyMap <K, V>{
+
+    private MyMap<K, V> myMap;
+    private K key;
+    private V value;
+
+
+    public void set (K key, V value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public MyMap() {
+        myMap = new MyMap<>();
+    }
+
+    public int size() {
+        return myMap.size();
+    }
+
+    public boolean isEmpty() {
+        return myMap.isEmpty();
+    }
+
+    public boolean containsKey(K key){
+        if (myMap.getKey() == key) {
+            return true;
+        }else
+            return false;
+    }
+
+    public boolean containsValue(K value){
+        if(myMap.getValue() == value) {
+            return true;
+        }else
+            return false;
+    }
+
+    public void put(K key, K value){
+        if (myMap.getKey() != key) {
+            myMap.put(key, value);
+        }
+    }
+
+    public void remove(K key) {
+        myMap.remove(key);
+    }
+
+    public void clear() {
+        myMap.clear();
+    }
+
+
+    public void values(){
+    }
+
+    public void equals(){
+    }
+
+    public int hashCode(){
+        return myMap.hashCode();
+    }
+
+
+    //Getters & Setters for Key & Value
+    public K getKey() {
+        return key;
+    }
+
+    public void setKey(K key) {
+        this.key = key;
+    }
+
+    public V getValue() {
+        return value;
+    }
+
+    public void setValue(V value) {
+        this.value = value;
+    }
+}
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
index d0ddbfa..ac2e7a7 100644
--- a/src/main/java/MySet.java
+++ b/src/main/java/MySet.java
@@ -1,6 +1,6 @@
 public class MySet <K> {
 
-    private MyArrayList<K> mySet;
+    private MyArrayList<K, V> mySet;
 
     public MySet() {
         mySet = new MyArrayList<>();
diff --git a/src/test/java/myArrayListTest.java b/src/test/java/myArrayListTest.java
index 31a7d4b..e001bdd 100644
--- a/src/test/java/myArrayListTest.java
+++ b/src/test/java/myArrayListTest.java
@@ -6,7 +6,7 @@ public class myArrayListTest {
     @Test
     public void addLongTest() {
         //Given
-        MyArrayList<Long> myArrayList = new MyArrayList<>();
+        MyArrayList<Long, V> myArrayList = new MyArrayList<>();
         Long valueToAdd = 4L;
         myArrayList.add(1L);
         myArrayList.add(2L);
@@ -26,7 +26,7 @@ public void addLongTest() {
     @Test
     public void addStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
         String valueToAdd = "Paxton";
         myArrayList.add("Kay");
         myArrayList.add(valueToAdd);
@@ -46,7 +46,7 @@ public void addStringTest() {
     @Test
     public void addIntegerTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
         Integer valueToAdd = 12;
         myArrayList.add(2);
         myArrayList.add(9);
@@ -69,7 +69,7 @@ public void addIntegerTest() {
     @Test
     public void sizeTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
         Integer valueToAdd = 12;
         myArrayList.add(2);
         myArrayList.add(9);
@@ -92,7 +92,7 @@ public void sizeTest() {
     @Test
     public void sizeStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
         String valueToAdd = "Paxton";
         myArrayList.add("Kay");
         myArrayList.add(valueToAdd);
@@ -112,7 +112,7 @@ public void sizeStringTest() {
     @Test
     public void setIntTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -132,7 +132,7 @@ public void setIntTest() {
     @Test
     public void setStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
         myArrayList.add("Joseph");
@@ -153,7 +153,7 @@ public void setStringTest() {
     @Test
     public void addIndexTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -173,7 +173,7 @@ public void addIndexTest() {
     @Test
     public void addStringIndexTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -193,7 +193,7 @@ public void addStringIndexTest() {
     @Test
     public void toArrayIntTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -212,7 +212,7 @@ public void toArrayIntTest() {
     @Test
     public void toArrayStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -231,7 +231,7 @@ public void toArrayStringTest() {
     @Test
     public void getIndexIntTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -251,7 +251,7 @@ public void getIndexIntTest() {
     @Test
     public void getIndexStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -271,7 +271,7 @@ public void getIndexStringTest() {
     @Test
     public void removeIntTest(){
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -291,7 +291,7 @@ public void removeIntTest(){
     @Test
     public void removeStringTest(){
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -311,7 +311,7 @@ public void removeStringTest(){
     @Test
     public void clearTest(){
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -332,7 +332,7 @@ public void clearTest(){
     @Test
     public void clearStringTest(){
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");
@@ -352,7 +352,7 @@ public void clearStringTest(){
     @Test
     public void isEmptyTest() {
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -372,7 +372,7 @@ public void isEmptyTest() {
     @Test
     public void isEmptyStringTest() {
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");
@@ -390,7 +390,7 @@ public void isEmptyStringTest() {
     @Test
     public void containsTest(){
         //Given
-        MyArrayList<Integer> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add(1);
         myArrayList.add(2);
@@ -408,7 +408,7 @@ public void containsTest(){
     @Test
     public void containsStringTest(){
         //Given
-        MyArrayList<String> myArrayList = new MyArrayList<>();
+        MyArrayList<String, V> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");

From a92d15c5eec4f2d031a6cd12d0ab73c0917b726d Mon Sep 17 00:00:00 2001
From: Karousha Fennimore <karousha@gmail.com>
Date: Sun, 11 Mar 2018 13:32:48 -0400
Subject: [PATCH 3/3] failing Tests

---
 .idea/workspace.xml                | 272 ++++++++++++-----------------
 src/main/java/MyArrayList.java     |   2 +-
 src/main/java/MySet.java           |   3 +-
 src/test/java/myArrayListTest.java |  42 ++---
 src/test/java/myMapTest.java       | 157 +++++++++--------
 5 files changed, 225 insertions(+), 251 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b670a4e..34d9fd1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0221460d-f0a0-4dbf-b417-e5639df829f0" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/MyMap.java" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
       <change beforePath="$PROJECT_DIR$/src/test/java/myArrayListTest.java" afterPath="$PROJECT_DIR$/src/test/java/myArrayListTest.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/myMapTest.java" afterPath="$PROJECT_DIR$/src/test/java/myMapTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,33 +18,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="565">
-              <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
-              <folding>
-                <element signature="e#114#115#0" expanded="true" />
-                <element signature="e#162#163#0" expanded="true" />
-                <element signature="e#197#198#0" expanded="true" />
-                <element signature="e#248#249#0" expanded="true" />
-                <element signature="e#429#430#0" expanded="true" />
-                <element signature="e#472#473#0" expanded="true" />
-                <element signature="e#502#503#0" expanded="true" />
-                <element signature="e#542#543#0" expanded="true" />
-                <element signature="e#566#567#0" expanded="true" />
-                <element signature="e#606#607#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="myMapTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/myMapTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
-              <folding />
+            <state relative-caret-position="1081">
+              <caret line="96" column="2" lean-forward="false" selection-start-line="96" selection-start-column="2" selection-end-line="96" selection-end-column="2" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -51,8 +33,8 @@
       <file leaf-file-name="MyMap.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
+            <state relative-caret-position="-496">
+              <caret line="0" column="3" lean-forward="false" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
               <folding>
                 <element signature="e#218#219#0" expanded="true" />
                 <element signature="e#255#256#0" expanded="true" />
@@ -79,55 +61,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MySet.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="109">
-              <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-              <folding>
-                <element signature="e#83#84#0" expanded="true" />
-                <element signature="e#126#127#0" expanded="true" />
-                <element signature="e#272#273#0" expanded="true" />
-                <element signature="e#307#308#0" expanded="true" />
-                <element signature="e#338#339#0" expanded="true" />
-                <element signature="e#377#378#0" expanded="true" />
-                <element signature="e#480#481#0" expanded="true" />
-                <element signature="e#515#516#0" expanded="true" />
-                <element signature="e#553#554#0" expanded="true" />
-                <element signature="e#595#596#0" expanded="true" />
-                <element signature="e#622#623#0" expanded="true" />
-                <element signature="e#651#652#0" expanded="true" />
-                <element signature="e#683#684#0" expanded="true" />
-                <element signature="e#721#722#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="mySetTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/mySetTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="182" column="34" lean-forward="true" selection-start-line="182" selection-start-column="34" selection-end-line="182" selection-end-column="34" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="myArrayListTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
-              <caret line="419" column="52" lean-forward="false" selection-start-line="419" selection-start-column="52" selection-end-line="419" selection-end-column="52" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -159,11 +92,11 @@
         <option value="$PROJECT_DIR$/src/test/java/removeTests.java" />
         <option value="$PROJECT_DIR$/src/test/java/addTests.java" />
         <option value="$PROJECT_DIR$/src/test/java/mySetTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
-        <option value="$PROJECT_DIR$/src/test/java/myMapTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
         <option value="$PROJECT_DIR$/src/test/java/myArrayListTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
+        <option value="$PROJECT_DIR$/src/test/java/myMapTest.java" />
       </list>
     </option>
   </component>
@@ -269,7 +202,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.mySetTest">
+  <component name="RunManager" selected="JUnit.myMapTest">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -460,10 +393,10 @@
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.mySetTest" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.myArrayListTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.myMapTest.sizeIntTest" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.myMapTest" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.myMapTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.myMapTest.sizeIntTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.mySetTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.myArrayListTest" />
         <item index="4" class="java.lang.String" itemvalue="JUnit.mySetTest.add" />
       </list>
     </recent_temporary>
@@ -482,7 +415,7 @@
       <option name="presentableId" value="Default" />
       <updated>1520602232939</updated>
       <workItem from="1520602234369" duration="2374000" />
-      <workItem from="1520628743410" duration="19860000" />
+      <workItem from="1520628743410" duration="21779000" />
     </task>
     <servers />
   </component>
@@ -490,40 +423,39 @@
     <history-entry file="myArrayListTest - 2018.03.11 at 12h 37m 18s.xml">
       <configuration name="myArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="myMapTest - 2018.03.11 at 12h 24m 35s.xml">
-      <configuration name="myMapTest" configurationId="JUnit" />
+    <history-entry file="myArrayListTest - 2018.03.11 at 13h 16m 53s.xml">
+      <configuration name="myArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="myMapTest_sizeIntTest - 2018.03.11 at 12h 25m 21s.xml">
-      <configuration name="myMapTest.sizeIntTest" configurationId="JUnit" />
+    <history-entry file="myMapTest - 2018.03.11 at 13h 18m 54s.xml">
+      <configuration name="myMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 11h 45m 10s.xml">
-      <configuration name="mySetTest" configurationId="JUnit" />
+    <history-entry file="myMapTest - 2018.03.11 at 13h 26m 47s.xml">
+      <configuration name="myMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 11h 46m 32s.xml">
-      <configuration name="mySetTest" configurationId="JUnit" />
+    <history-entry file="myMapTest - 2018.03.11 at 13h 32m 30s.xml">
+      <configuration name="myMapTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 11h 50m 22s.xml">
-      <configuration name="mySetTest" configurationId="JUnit" />
+    <history-entry file="myMapTest_sizeIntTest - 2018.03.11 at 12h 25m 21s.xml">
+      <configuration name="myMapTest.sizeIntTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 12h 07m 24s.xml">
-      <configuration name="mySetTest" configurationId="JUnit" />
+    <history-entry file="myMapTest_sizeIntTest - 2018.03.11 at 13h 20m 14s.xml">
+      <configuration name="myMapTest.sizeIntTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 12h 08m 31s.xml">
+    <history-entry file="mySetTest - 2018.03.11 at 12h 37m 26s.xml">
       <configuration name="mySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 12h 09m 16s.xml">
+    <history-entry file="mySetTest - 2018.03.11 at 13h 17m 00s.xml">
       <configuration name="mySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="mySetTest - 2018.03.11 at 12h 37m 26s.xml">
+    <history-entry file="mySetTest - 2018.03.11 at 13h 18m 49s.xml">
       <configuration name="mySetTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22234000" />
+    <option name="totallyTimeSpent" value="24153000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="797" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -533,12 +465,13 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2532189" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -550,13 +483,38 @@
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -572,16 +530,16 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#114#115#0" expanded="true" />
-            <element signature="e#162#163#0" expanded="true" />
-            <element signature="e#197#198#0" expanded="true" />
-            <element signature="e#248#249#0" expanded="true" />
-            <element signature="e#429#430#0" expanded="true" />
-            <element signature="e#472#473#0" expanded="true" />
-            <element signature="e#502#503#0" expanded="true" />
-            <element signature="e#542#543#0" expanded="true" />
-            <element signature="e#566#567#0" expanded="true" />
-            <element signature="e#606#607#0" expanded="true" />
+            <element signature="e#111#112#0" expanded="true" />
+            <element signature="e#159#160#0" expanded="true" />
+            <element signature="e#194#195#0" expanded="true" />
+            <element signature="e#245#246#0" expanded="true" />
+            <element signature="e#426#427#0" expanded="true" />
+            <element signature="e#469#470#0" expanded="true" />
+            <element signature="e#499#500#0" expanded="true" />
+            <element signature="e#539#540#0" expanded="true" />
+            <element signature="e#563#564#0" expanded="true" />
+            <element signature="e#603#604#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -678,80 +636,82 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+        <state relative-caret-position="-515">
+          <caret line="5" column="27" lean-forward="true" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
           <folding>
-            <element signature="e#83#84#0" expanded="true" />
-            <element signature="e#126#127#0" expanded="true" />
-            <element signature="e#272#273#0" expanded="true" />
-            <element signature="e#307#308#0" expanded="true" />
-            <element signature="e#338#339#0" expanded="true" />
-            <element signature="e#377#378#0" expanded="true" />
-            <element signature="e#480#481#0" expanded="true" />
-            <element signature="e#515#516#0" expanded="true" />
-            <element signature="e#553#554#0" expanded="true" />
-            <element signature="e#595#596#0" expanded="true" />
-            <element signature="e#622#623#0" expanded="true" />
-            <element signature="e#651#652#0" expanded="true" />
-            <element signature="e#683#684#0" expanded="true" />
-            <element signature="e#721#722#0" expanded="true" />
+            <element signature="e#111#112#0" expanded="true" />
+            <element signature="e#159#160#0" expanded="true" />
+            <element signature="e#194#195#0" expanded="true" />
+            <element signature="e#245#246#0" expanded="true" />
+            <element signature="e#426#427#0" expanded="true" />
+            <element signature="e#469#470#0" expanded="true" />
+            <element signature="e#499#500#0" expanded="true" />
+            <element signature="e#539#540#0" expanded="true" />
+            <element signature="e#563#564#0" expanded="true" />
+            <element signature="e#603#604#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="565">
-          <caret line="77" column="1" lean-forward="true" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
+        <state relative-caret-position="325">
+          <caret line="410" column="26" lean-forward="false" selection-start-line="410" selection-start-column="26" selection-end-line="410" selection-end-column="26" />
           <folding>
-            <element signature="e#114#115#0" expanded="true" />
-            <element signature="e#162#163#0" expanded="true" />
-            <element signature="e#197#198#0" expanded="true" />
-            <element signature="e#248#249#0" expanded="true" />
-            <element signature="e#429#430#0" expanded="true" />
-            <element signature="e#472#473#0" expanded="true" />
-            <element signature="e#502#503#0" expanded="true" />
-            <element signature="e#542#543#0" expanded="true" />
-            <element signature="e#566#567#0" expanded="true" />
-            <element signature="e#606#607#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/myArrayListTest.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/mySetTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="419" column="52" lean-forward="false" selection-start-line="419" selection-start-column="52" selection-end-line="419" selection-end-column="52" />
+        <state relative-caret-position="141">
+          <caret line="228" column="16" lean-forward="false" selection-start-line="228" selection-start-column="16" selection-end-line="228" selection-end-column="16" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/mySetTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="182" column="34" lean-forward="true" selection-start-line="182" selection-start-column="34" selection-end-line="182" selection-end-column="34" />
+        <state relative-caret-position="735">
+          <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#80#81#0" expanded="true" />
+            <element signature="e#123#124#0" expanded="true" />
+            <element signature="e#269#270#0" expanded="true" />
+            <element signature="e#304#305#0" expanded="true" />
+            <element signature="e#335#336#0" expanded="true" />
+            <element signature="e#374#375#0" expanded="true" />
+            <element signature="e#477#478#0" expanded="true" />
+            <element signature="e#512#513#0" expanded="true" />
+            <element signature="e#550#551#0" expanded="true" />
+            <element signature="e#592#593#0" expanded="true" />
+            <element signature="e#619#620#0" expanded="true" />
+            <element signature="e#648#649#0" expanded="true" />
+            <element signature="e#680#681#0" expanded="true" />
+            <element signature="e#718#719#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/myMapTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
-          <folding />
+        <state relative-caret-position="1081">
+          <caret line="96" column="2" lean-forward="false" selection-start-line="96" selection-start-column="2" selection-end-line="96" selection-end-column="2" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
+        <state relative-caret-position="-496">
+          <caret line="0" column="3" lean-forward="false" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding>
             <element signature="e#218#219#0" expanded="true" />
             <element signature="e#255#256#0" expanded="true" />
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index 9e947d1..a3669d3 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -1,7 +1,7 @@
 import java.util.Arrays;
 
 
-public class MyArrayList <K, V>{
+public class MyArrayList <K>{
 
     private K[] inputArray;
 
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
index ac2e7a7..51acb57 100644
--- a/src/main/java/MySet.java
+++ b/src/main/java/MySet.java
@@ -1,6 +1,6 @@
 public class MySet <K> {
 
-    private MyArrayList<K, V> mySet;
+    private MyArrayList<K> mySet;
 
     public MySet() {
         mySet = new MyArrayList<>();
@@ -47,3 +47,4 @@ public boolean isEmpty() {
 //
 //    }
 }
+
diff --git a/src/test/java/myArrayListTest.java b/src/test/java/myArrayListTest.java
index e001bdd..31a7d4b 100644
--- a/src/test/java/myArrayListTest.java
+++ b/src/test/java/myArrayListTest.java
@@ -6,7 +6,7 @@ public class myArrayListTest {
     @Test
     public void addLongTest() {
         //Given
-        MyArrayList<Long, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Long> myArrayList = new MyArrayList<>();
         Long valueToAdd = 4L;
         myArrayList.add(1L);
         myArrayList.add(2L);
@@ -26,7 +26,7 @@ public void addLongTest() {
     @Test
     public void addStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
         String valueToAdd = "Paxton";
         myArrayList.add("Kay");
         myArrayList.add(valueToAdd);
@@ -46,7 +46,7 @@ public void addStringTest() {
     @Test
     public void addIntegerTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
         Integer valueToAdd = 12;
         myArrayList.add(2);
         myArrayList.add(9);
@@ -69,7 +69,7 @@ public void addIntegerTest() {
     @Test
     public void sizeTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
         Integer valueToAdd = 12;
         myArrayList.add(2);
         myArrayList.add(9);
@@ -92,7 +92,7 @@ public void sizeTest() {
     @Test
     public void sizeStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
         String valueToAdd = "Paxton";
         myArrayList.add("Kay");
         myArrayList.add(valueToAdd);
@@ -112,7 +112,7 @@ public void sizeStringTest() {
     @Test
     public void setIntTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -132,7 +132,7 @@ public void setIntTest() {
     @Test
     public void setStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
         myArrayList.add("Joseph");
@@ -153,7 +153,7 @@ public void setStringTest() {
     @Test
     public void addIndexTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -173,7 +173,7 @@ public void addIndexTest() {
     @Test
     public void addStringIndexTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -193,7 +193,7 @@ public void addStringIndexTest() {
     @Test
     public void toArrayIntTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -212,7 +212,7 @@ public void toArrayIntTest() {
     @Test
     public void toArrayStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -231,7 +231,7 @@ public void toArrayStringTest() {
     @Test
     public void getIndexIntTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -251,7 +251,7 @@ public void getIndexIntTest() {
     @Test
     public void getIndexStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -271,7 +271,7 @@ public void getIndexStringTest() {
     @Test
     public void removeIntTest(){
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -291,7 +291,7 @@ public void removeIntTest(){
     @Test
     public void removeStringTest(){
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Kay");
         myArrayList.add("Paxton");
@@ -311,7 +311,7 @@ public void removeStringTest(){
     @Test
     public void clearTest(){
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -332,7 +332,7 @@ public void clearTest(){
     @Test
     public void clearStringTest(){
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");
@@ -352,7 +352,7 @@ public void clearStringTest(){
     @Test
     public void isEmptyTest() {
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(0);
         myArrayList.add(1);
@@ -372,7 +372,7 @@ public void isEmptyTest() {
     @Test
     public void isEmptyStringTest() {
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");
@@ -390,7 +390,7 @@ public void isEmptyStringTest() {
     @Test
     public void containsTest(){
         //Given
-        MyArrayList<Integer, V> myArrayList = new MyArrayList<>();
+        MyArrayList<Integer> myArrayList = new MyArrayList<>();
 
         myArrayList.add(1);
         myArrayList.add(2);
@@ -408,7 +408,7 @@ public void containsTest(){
     @Test
     public void containsStringTest(){
         //Given
-        MyArrayList<String, V> myArrayList = new MyArrayList<>();
+        MyArrayList<String> myArrayList = new MyArrayList<>();
 
         myArrayList.add("Hello");
         myArrayList.add("There");
diff --git a/src/test/java/myMapTest.java b/src/test/java/myMapTest.java
index 80e5606..c00599b 100644
--- a/src/test/java/myMapTest.java
+++ b/src/test/java/myMapTest.java
@@ -1,52 +1,87 @@
-//import org.junit.Assert;
-//import org.junit.Test;
-//
-//public class myMapTest {
-//
-//    @Test
-//    public void sizeIntTest() {
-//        //Given
-//        MyMap<Integer> testMap = new MyMap<>();
-//        testMap.put(1);
-//        testMap.put(2);
-//        testMap.put(3);
-//        testMap.put(4);
-//
-//        //When
-//        int expected = 4;
-//        int actual = testMap.size();
-//
-//        //Then
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void isEmpty() {
-//        //Given
-//        MyMap<Integer> testSet = new MyMap<>();
-//        testSet.put(1);
-//        testSet.put(2);
-//        testSet.put(3);
-//
-//        //When
-//        boolean expected = false;
-//        boolean actual = testSet.isEmpty();
-//
-//        Assert.assertEquals(expected,actual);
-//    }
-//    }
-//
-//    @Test
-//    public void containsKey() {
-//    }
-//
-//    @Test
-//    public void containsValue() {
-//    }
-//
-//    @Test
-//    public void get() {
-//    }
+import org.junit.Assert;
+import org.junit.Test;
+
+public class myMapTest {
+
+    @Test
+    public void sizeIntTest() {
+        //Given
+        MyMap mapTest = new MyMap();
+        mapTest.put(0, "Pax");
+        mapTest.put(1, "Joe");
+        mapTest.put(2, "Kay");
+
+        //When
+        int expected = 3;
+        int actual = mapTest.size();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmpty() {
+        //Given
+        MyMap mapTest = new MyMap();
+        mapTest.put("Pax", 1);
+        mapTest.put("Kay", 2);
+        mapTest.put("Joe", 3);
+
+        //When
+        boolean expected = false;
+        boolean actual = mapTest.isEmpty();
+
+        Assert.assertEquals(expected,actual);
+    }
+
+
+    @Test
+    public void containsKey() {
+        //Given
+        MyMap mapTest = new MyMap();
+        mapTest.put("Pax", 1);
+        mapTest.put("Kay", 2);
+        mapTest.put("Joe", 3);
+
+        //When
+        boolean expected = true;
+        boolean actual = mapTest.containsKey("Pax");
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void containsValue() {
+        //Given
+        MyMap mapTest = new MyMap();
+        mapTest.put("Pax", 1);
+        mapTest.put("Kay", 2);
+        mapTest.put("Joe", 3);
+
+        //When
+        boolean expected = true;
+        boolean actual = mapTest.containsValue(1);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void clear() {
+        //Given
+        MyMap mapTest = new MyMap();
+        mapTest.put("Pax", 1);
+        mapTest.put("Kay", 2);
+        mapTest.put("Joe", 3);
+
+        //When
+        mapTest.clear();
+
+        int expected = 0;
+        int actual = mapTest.size();
+
+        //Then
+        Assert.assertEquals(expected,actual);
+    }
 //
 //    @Test
 //    public void put() {
@@ -60,23 +95,6 @@
 //    public void remove() {
 //    }
 //
-//    @Test
-//    public void clear() {
-//        //Given
-//        MyMap<Integer> testSet = new MyMap<>();
-//        testSet.put(1);
-//        testSet.put(2);
-//        testSet.put(3);
-//
-//        //When
-//        testSet.clear();
-//
-//        int expected = 0;
-//        int actual = testSet.size();
-//
-//        //Then
-//        Assert.assertEquals(expected,actual);
-//    }
 //
 //    @Test
 //    public void keySet() {
@@ -94,9 +112,4 @@
 //    public void equals() {
 //    }
 //
-//    @Test
-//    public int hashCode() {
-//
-//        return 0;
-//    }
-//}
+}