diff --git a/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.markers.snap b/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.markers.snap
index da1478e..c5dab47 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.markers.snap and b/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.markers.snap differ
diff --git a/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.syncinfo.snap b/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.syncinfo.snap
index 414a6b3..fd766bf 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.syncinfo.snap and b/p1/.metadata/.plugins/org.eclipse.core.resources/.projects/jdt.ls-java-project/.syncinfo.snap differ
diff --git a/p1/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/p1/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
index 414a6b3..fd766bf 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and b/p1/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap differ
diff --git a/p1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/p1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
index cf9f7f0..237ab1c 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/p1/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ
diff --git a/p1/.metadata/.plugins/org.eclipse.core.resources/0.snap b/p1/.metadata/.plugins/org.eclipse.core.resources/0.snap
index 0264b3f..880fda0 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.core.resources/0.snap and b/p1/.metadata/.plugins/org.eclipse.core.resources/0.snap differ
diff --git a/p1/.metadata/.plugins/org.eclipse.jdt.core/3842426239.index b/p1/.metadata/.plugins/org.eclipse.jdt.core/3842426239.index
index 1b34a07..978708f 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.jdt.core/3842426239.index and b/p1/.metadata/.plugins/org.eclipse.jdt.core/3842426239.index differ
diff --git a/p1/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/p1/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
index c9b3630..d6ac5f5 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/p1/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ
diff --git a/p1/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/p1/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
index 6dc1174..ddbfde9 100644
--- a/p1/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
+++ b/p1/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
@@ -7,8 +7,8 @@ INDEX VERSION 1.131+/home/max/src/cs448/p1/.metadata/.plugins/org.eclipse.jdt.co
 116444480.index
 3664742106.index
 131124632.index
-3842426239.index
 2054031921.index
+3842426239.index
 629469267.index
 1986281775.index
 1844288107.index
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_b.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_b.cfs
deleted file mode 100644
index bf1657d..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_b.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_c.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_c.cfs
deleted file mode 100644
index 21c08b6..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_c.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_d.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_d.cfs
deleted file mode 100644
index d35a822..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_d.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_e.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_e.cfs
deleted file mode 100644
index fed7469..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_e.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_f.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_f.cfs
deleted file mode 100644
index 4a5c4fa..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_f.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_g.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_g.cfs
deleted file mode 100644
index f2379e0..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_g.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_h.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_h.cfs
deleted file mode 100644
index 49317de..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_h.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_i.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_i.cfs
deleted file mode 100644
index 667e9bf..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_i.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_a.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_k.cfs
similarity index 52%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_a.cfs
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_k.cfs
index df588c2..92c5287 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_a.cfs and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_k.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_a_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_k_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_a_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_k_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_l.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_l.cfs
new file mode 100644
index 0000000..e97bd36
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_l.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_b_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_l_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_b_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_l_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_m.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_m.cfs
new file mode 100644
index 0000000..d88a921
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_m.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_c_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_m_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_c_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_m_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_n.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_n.cfs
new file mode 100644
index 0000000..f915184
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_n.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_d_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_n_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_d_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_n_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_o.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_o.cfs
new file mode 100644
index 0000000..58971cf
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_o.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_e_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_o_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_e_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_o_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_p.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_p.cfs
new file mode 100644
index 0000000..87e3648
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_p.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments.gen b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments.gen
index 568652b..58d0276 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments.gen and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments.gen differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_j b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_j
deleted file mode 100644
index 52a4ad0..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_j and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_p b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_p
new file mode 100644
index 0000000..8a36e7e
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/segments_p differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_b.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_b.cfs
deleted file mode 100644
index ebc23a4..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_b.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_c.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_c.cfs
deleted file mode 100644
index fa31cde..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_c.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_d.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_d.cfs
deleted file mode 100644
index deb8a48..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_d.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_e.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_e.cfs
deleted file mode 100644
index b68a619..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_e.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_f.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_f.cfs
deleted file mode 100644
index 3b5520a..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_f.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_g.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_g.cfs
deleted file mode 100644
index 88a0ad4..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_g.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h.cfs
deleted file mode 100644
index a2ff08e..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_h_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_i.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_i.cfs
deleted file mode 100644
index f89cdd2..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_i.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_a.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_k.cfs
similarity index 51%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_a.cfs
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_k.cfs
index af153b3..e6b6e07 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_a.cfs and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_k.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_f_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_k_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_f_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_k_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_l.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_l.cfs
new file mode 100644
index 0000000..5937a0a
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_l.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_g_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_l_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_g_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_l_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_m.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_m.cfs
new file mode 100644
index 0000000..ad56719
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_m.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_h_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_m_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/05b0fe8524860bd73cbb07ef30fb34cc/_h_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_m_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_n.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_n.cfs
new file mode 100644
index 0000000..695b6e8
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_n.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_a_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_n_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_a_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_n_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_o.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_o.cfs
new file mode 100644
index 0000000..e3c6f51
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_o.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_b_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_o_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_b_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_o_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_p.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_p.cfs
new file mode 100644
index 0000000..491197a
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_p.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments.gen b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments.gen
index 568652b..58d0276 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments.gen and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments.gen differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_j b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_j
deleted file mode 100644
index b48b922..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_j and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_p b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_p
new file mode 100644
index 0000000..53ecb1c
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/segments_p differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a.cfs
deleted file mode 100644
index 190fd00..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_a_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b.cfs
deleted file mode 100644
index 3f2df2b..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_b_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c.cfs
deleted file mode 100644
index 7c48236..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_c_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d.cfs
deleted file mode 100644
index 832dc18..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_d_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e.cfs
deleted file mode 100644
index 217cf16..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_e_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f.cfs
deleted file mode 100644
index 6694d42..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_f_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g.cfs
deleted file mode 100644
index 1693daf..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_g_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h.cfs
deleted file mode 100644
index beffa0d..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h_1.del
deleted file mode 100644
index 1b473bd..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_h_1.del and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_i.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_i.cfs
deleted file mode 100644
index 39b83b4..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_i.cfs and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_k.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_k.cfs
new file mode 100644
index 0000000..c351ffb
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_k.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_c_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_k_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_c_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_k_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_l.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_l.cfs
new file mode 100644
index 0000000..72e12a1
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_l.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_d_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_l_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_d_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_l_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_m.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_m.cfs
new file mode 100644
index 0000000..7d5e80e
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_m.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_e_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_m_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_e_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_m_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_n.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_n.cfs
new file mode 100644
index 0000000..1f515b8
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_n.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_f_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_n_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_f_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_n_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_o.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_o.cfs
new file mode 100644
index 0000000..8181675
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_o.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_g_1.del b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_o_1.del
similarity index 100%
rename from p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/69a8d5068917142492d0b4590fb578af/_g_1.del
rename to p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_o_1.del
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_p.cfs b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_p.cfs
new file mode 100644
index 0000000..997f67f
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/_p.cfs differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen
index 568652b..58d0276 100644
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments.gen differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_j b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_j
deleted file mode 100644
index 7a63636..0000000
Binary files a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_j and /dev/null differ
diff --git a/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_p b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_p
new file mode 100644
index 0000000..ab4203a
Binary files /dev/null and b/p1/.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d2fabe0/segments_p differ
diff --git a/p1/data.db b/p1/data.db
index b50da2b..1b145ea 100644
Binary files a/p1/data.db and b/p1/data.db differ
diff --git a/p1/run b/p1/run
index 82d59b8..5b3ba46 100755
--- a/p1/run
+++ b/p1/run
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-java -cp ./target/cs448p1-1.0-SNAPSHOT-jar-with-dependencies.jar -Xmx44m cs448.App "$1" "$2" "$3"
+java -cp ./target/cs448p1-1.0-SNAPSHOT-jar-with-dependencies.jar -Xmx32m cs448.App "$1" "$2" "$3"
diff --git a/p1/src/main/java/cs448/project1.java b/p1/src/main/java/cs448/project1.java
index 43ef2c8..01cc724 100644
--- a/p1/src/main/java/cs448/project1.java
+++ b/p1/src/main/java/cs448/project1.java
@@ -2,6 +2,7 @@ package cs448;
 
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
+import org.mapdb.Serializer;
 
 import java.io.IOException;
 import java.io.BufferedReader;
@@ -20,7 +21,7 @@ public class project1 {
     DB db = DBMaker.fileDB(dbfile).make();
 
     // use this for MapDB storage
-    ConcurrentMap mapdb = db.hashMap("map").make();
+    ConcurrentMap<String, String> mapdb = db.hashMap("map", Serializer.STRING, Serializer.STRING).make();
 
     void load_mainmemory(String file_path) throws IOException {
         try (BufferedReader tsvFile = new BufferedReader(new FileReader(file_path))) {
@@ -49,7 +50,29 @@ public class project1 {
     }
 
     void load_mapdb(String file_path) throws IOException{
-        /** Put your code here **/
+        try (BufferedReader tsvFile = new BufferedReader(new FileReader(file_path))) {
+            String line = "";
+            String value = "";
+            while ((line = tsvFile.readLine()) != null ) {
+                String[] parts = line.split("\t");
+                    
+                for (int i = 1; i < parts.length; i++) {
+                    if (i == parts.length) {
+                        value += parts[i];
+                    } else {
+                        value += parts[i] + "\t";
+                    }
+                    parts[i] = null;
+                }
+
+                mapdb.put(parts[0], value);
+                parts[0] = null;
+                line = null;
+                value = null;
+            }
+        } catch (IOException e) {
+            throw e;
+        }
     }
 
     String select_file(String key, String file_path) throws IOException{
@@ -81,8 +104,8 @@ public class project1 {
     String select_mainmemory(String key){
         return mm_map.get(key);
     }
+
     String select_mapdb(String key){
-        /** Put your code here **/
-        return "";
+        return mapdb.get(key);
     }
 }