diff --git a/Pokemon/.idea/.idea.Pokemon/.idea/indexLayout.xml b/Pokemon/.idea/.idea.Pokemon/.idea/indexLayout.xml
index 7b08163c..c7db2749 100644
--- a/Pokemon/.idea/.idea.Pokemon/.idea/indexLayout.xml
+++ b/Pokemon/.idea/.idea.Pokemon/.idea/indexLayout.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="UserContentModel">
-    <attachedFolders />
+    <attachedFolders>
+      <Path>../../PokemonOutscal</Path>
+    </attachedFolders>
     <explicitIncludes />
     <explicitExcludes />
   </component>
diff --git a/Pokemon/.idea/.idea.Pokemon/.idea/workspace.xml b/Pokemon/.idea/.idea.Pokemon/.idea/workspace.xml
index 07f6ae67..064770b9 100644
--- a/Pokemon/.idea/.idea.Pokemon/.idea/workspace.xml
+++ b/Pokemon/.idea/.idea.Pokemon/.idea/workspace.xml
@@ -4,36 +4,54 @@
     <projectFile>Pokemon.vcxproj</projectFile>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="76848a35-e7a8-4068-95a7-3f62e568fd20" name="Changes" comment="" />
+    <list default="true" id="76848a35-e7a8-4068-95a7-3f62e568fd20" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Pokemon/.idea/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Pokemon/.idea/indexLayout.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Pokemon/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Pokemon/.idea/workspace.xml" afterDir="false" />
+    </list>
     <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="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$/.." value="Project_Setup" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
-  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
-  "lastFilter": {
-    "state": "OPEN",
-    "assignee": "mridul-outscal"
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;mridul-outscal&quot;
   }
-}]]></component>
-  <component name="GithubPullRequestsUISettings"><![CDATA[{
-  "selectedUrlAndAccountId": {
-    "url": "https://github.com/outscal/Pokemon.git",
-    "accountId": "89f7c2c3-3da3-455e-95dc-ff6aa1f75841"
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/outscal/Pokemon.git&quot;,
+    &quot;accountId&quot;: &quot;89f7c2c3-3da3-455e-95dc-ff6aa1f75841&quot;
   }
-}]]></component>
+}</component>
   <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 8
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
   <component name="ProjectId" id="2ljaBYeHHZcZ81RrANk9WfZpGXP" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "Part1",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -43,6 +61,8 @@
       <option name="presentableId" value="Default" />
       <updated>1725695804824</updated>
       <workItem from="1725695806886" duration="65000" />
+      <workItem from="1750104576335" duration="224000" />
+      <workItem from="1750104833156" duration="107000" />
     </task>
     <task id="LOCAL-00001" summary="init commit">
       <option name="closed" value="true" />
@@ -60,6 +80,34 @@
   </component>
   <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
   <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="CUSTOM_BOOLEAN_PROPERTIES">
+                <map>
+                  <entry key="Show.Git.Branches" value="true" />
+                </map>
+              </option>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="Part1" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
     <MESSAGE value="init commit" />
diff --git a/Pokemon/Test.txt b/Pokemon/Test.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/Pokemon/main.cpp b/Pokemon/main.cpp
index c2bc7bfc..bb6052bb 100644
--- a/Pokemon/main.cpp
+++ b/Pokemon/main.cpp
@@ -1,6 +1,37 @@
 #include <iostream>
+#include <map>
+#include <vector>
+using namespace std;
+
+map<int,vector<string>> static PokemonChecker = {{1, {"Bulbasaur", "wise"}},{2, {"Charmander", "fiery"}},{3, {"Squirtle", "cool"}}};
+
+void starter()
+{
+    while (true)
+    {
+        cout << "You can choose one of the following Pokemon:\n";
+        for (const auto& i : PokemonChecker)
+        {
+            cout << i.first << ". " << *i.second.begin() << "\n";
+        }
+        cout << "Which Pokemon would you like to choose? Enter the number: ";
+    
+        int choice;
+        cin >> choice;
+
+        if (PokemonChecker.find(choice) != PokemonChecker.end()) {
+            std::cout << "You chose " << *PokemonChecker[choice].begin() << "! A " << PokemonChecker[choice].back() << " choice.\n";
+            break;
+        } else {
+            std::cout << "Invalid choice. Please restart.\n";
+        }
+    }
+}
 
 int main() {
+    cout << "Welcome to the world of Pokemon! I am Professor Oak.\n";
+
+    starter();
 
     return 0;
 }