diff --git a/UML Diagrams/Conflict Resolution/Project_ilmatar_phase2_UML_conflictResultsProcess_2021_12_19.drawio b/UML Diagrams/Conflict Resolution/Project_ilmatar_phase2_UML_conflictResultsProcess_2021_12_19.drawio
new file mode 100644
index 0000000..ac5bcf4
--- /dev/null
+++ b/UML Diagrams/Conflict Resolution/Project_ilmatar_phase2_UML_conflictResultsProcess_2021_12_19.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2021-12-19T19:53:37.715Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="B-HIin1hqArnjoXj039H" version="14.5.1" type="device"><diagram id="iDLdeXnK-QtA12vY3kQD" name="Page-1">7VbLbtswEPwaAcnBhR524BxjOUkPDpLGBYqeCkaiJSIUVyBXsZ2v79KkrMiKAado0EsBAdIOZ/nYGS4UJGm1udWsLu8g5zKIw3wTJPMgjqNwekEvi2wdMr4cO6DQIvekDliKV95merQROTc9IgJIFHUfzEApnmEPY1rDuk9bgeyvWrOCD4BlxuQQ/SFyLB06nYQd/pWLomxXjkI/UrGW7AFTshzWb6DkOkhSDYDuq9qkXNritXVxeTdHRvcb01zhKQny59PoZnZ9q3FTfjOM/2pe+cjP8sJk4w9MhVxJkaHmppFoHjRk3Bh/BNy2dTFrUUmmKJqtQOHSj0QUMykKRd8ZbYxrAl64RkElvfIDCDWhWSlkvmBbaOz2DbLsuY1mJWjxStMy6eekYY3eHfFFj7G0mQSHhNKmifPQ1iQ6gO7YpkdcMIMeyEBKVhvxtD9GxXQh1AwQofIkXyw6Dt8cVSHaa0uXgkPFUW+J4hPiqbeDvw9tuO7MFY89Vr4xVpx4kHlDF/upO83pw8v+AQvEAwsE8cwmKYGCoXjh9zq3Ol4RuBAGz4TC84BUiJPIVcXS6eqLleDaOCJxBpScr7iiqR6dtVIms0bSCqC6nORmkAZ1DYrKa4Z55kjiiEDPdow7hlpsBi4mHXHnLg3PPAUJdMy5AmdrIeUB1Dpb8hUe9bWpWSZUsdhx5uMOefRqWggodyV37aAUec6V9SQgQ+YMaA9RA51rp/ZkRg/pn4ZfJsGENp5SHHUxPZauMaWSoGa7esw5uXvNrcNPM+7xBjF0s3dvfHGae6Nw/EnuTd5x74HIUuzEcyK3TTz6I4Ur0kryTtLvVvH5KBrIngxlT96RWLInLh/ACHcJ5tpxD6T/V+pGyYnNafpJ4o6PtKarzNbr7L62r3N3w10waB73DWa0mzPfDQ7I/9vBXzbM9DTDXMYfdgyF3b/SbuzNH2dy/Rs=</diagram></mxfile>
\ No newline at end of file
diff --git a/UML Diagrams/Conflict Results/project_ilmatar_phase2_UML_conflictResultsProcess_20220123.drawio b/UML Diagrams/Conflict Results/project_ilmatar_phase2_UML_conflictResultsProcess_20220123.drawio
new file mode 100644
index 0000000..18aec74
--- /dev/null
+++ b/UML Diagrams/Conflict Results/project_ilmatar_phase2_UML_conflictResultsProcess_20220123.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-01-23T18:45:57.799Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="VJJz8n26n-URK1f9rdDh" version="14.5.1" type="device"><diagram id="SkXONe1NFQ95SQfAr7KN" name="Page-1">7VZRb5swEP41kbqHTgFKl9eEdFulVK2aaXuMXOOAVeND9qVJ+ut3YBNKCFI6rdrLJCTsz98Z332fT4yipNh9M6zM7yAVahSO090omo/CMAjGIb0qZO+QOBg7IDMy9aQWWMpX4cGGtpGpsB0iAiiUZRfkoLXg2MGYMbDt0tagul8tWSZ6wJIz1Ud/yRRzh07icYt/FzLL8ZCwXylYQ/aAzVkK2zdQdDOKEgOAblTsEqGq4jV1cXFfB1YPBzNC4zkBRbC4WU0ixp7ifJNyu53e20u/ywtTG59wAnqtJMdHYTcK7YMBLqz1KeC+qYvdykIxTbPZGjQu/UpAc6ZkpmnM6WDCEPAiDEoq6dQvIJSE8lyqdMH2sKmOb5Hx52Y2y8HIV9qWKb8nLRv07givO4xlFUnwmFAjLHEempoER9Ad23WIC2bRAxyUYqWVT4c0CmYyqWeACIUn+WJROmI3qEJw0JYuhYBCoNkTxQeE17EL8fchaJy0bd0VNZbJ3zrriweZd3R22LsVnQZe93d4IOx5YBRSquNbLVEylC9idW/SSskpoQtJNSMJwihwJamoU44S9CoVXFEl0pPMS4KWEjesplKncKxb3d9uLtZC0xdX3oSrhCnu6PIE/b4sQVP9h+hH1iXxsLaUgWeRgALKbK7BeVkqdQQ1dlZijYNmtiXjUmeLmjO/apFHr2AFAcWuVd0DcpmmQldGBGTInOuqjEqgI9cKxzN6SPNk/DkexXTwhOZBO6enohukG0u5MFkbUJClt6Ky9XluHe4KfQvvGwuf59jJ1QcZNjph2CONlay1cxo3jTv4I4ELkkqJVtEfleDzy6CnetRXPTqhsGJPQj2AldU9IMw47pHy/0rcIDizH00+SNyrgW506Ak/l6vjC39B5fnkLvwdQyN3/RaxQU4HpMiq6vbC0T4NtLT/DeMve2pynqfi8N2momn7C1WvvfkRjW5+Aw==</diagram></mxfile>
\ No newline at end of file
diff --git a/UML Diagrams/Extended Conflict/Phase2_UML_ExtendedConflictProcess_20220112.drawio b/UML Diagrams/Extended Conflict/Phase2_UML_ExtendedConflictProcess_20220112.drawio
new file mode 100644
index 0000000..9e16895
--- /dev/null
+++ b/UML Diagrams/Extended Conflict/Phase2_UML_ExtendedConflictProcess_20220112.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2022-01-16T19:01:26.908Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="CUrvVHbLKqzgRZk3wFkO" version="14.5.1" type="device"><diagram id="GAiG6-PWQGHPVAabxq3R" name="Page-1">7VbBbptAEP0apOSQyoCduEcbJ20lR0rrqFGPGxjDKMsOWtYxztd3FhZjm1hxqka9VLJk9s3bhZn3ZsALo7z6okWR3VIC0gsGSeWFMy8I/MH4kv8ssmmQ4edhA6QaE0fqgAW+QLvToStMoNwjGiJpsNgHY1IKYrOHCa1pvU9bkty/ayFS6AGLWMg++oCJyRp0PBp0+FfANGvv7A9cJBct2QFlJhJa70DhtRdGmsg0V3kVgbTFa+vS7Ls5Et0+mAZlTtkQV7/gfhhscBr9HD4oWXy/ublwpzwLuXIJX1cGVAJJRGopkSvaPLzZtBUp15hLoXg1XZIyCxfxeS0kpoqvY34k0Aw8gzbIxZy4gKGC0ThDmczFhlb2wUsj4qd2Nc1I4wsfK6Q7k8PaOF8El3uMhd3J8IBRDSVz7tpq+AfQraj2iHNRGgfEJKUoSnzcppELnaKakjGUO5IrE6cD1dH6+1tVuR2AcjB6wxS3IfzsjOA6wb9y63XnqyB0WLbrqbEDhfNyuj27k5svnOLvUD/oqe8FU9slCLZNJrbZNgV4XPcg9Js62HiUEcbQEObIlewIZy5Wd6RBoUqbDfewF0Q2BVNrVl8nWIJKbf/Vy51DMpCF41DSxkvg+ww0iNggKYcVnOV5z6Iskqmto+kJIpLEXpwpajyLUh5ArW0lLM1R05aFiFGl85ozG3bID6eUhYj3LmXd5ZxzAsoajowwonGXTa4gVKZWcjTlH+cdDT6NvNHMpjSa+t2af5auDfci5yKwNhqwdddg7XuaK4/3fd+qzprB5WnOvBp+kDHDV4x5oLHEWrtG43Y0+38kcM5SSegUvbeCzy78nuphX/XwFYWleAR5RyXWRg1nuuEeKP+vxN2+od5Sd/xB4g6PTJ3FqtA8Es64EufNbHnkN31v+LSFLXeItniHvG8KWRZ8trPoDeqdFBvQ5aSeLGdxPcEcfeKmzf8J85dNOD5xxATvdiEvu6+qOrbzbRpe/wY=</diagram></mxfile>
\ No newline at end of file
diff --git a/UML Diagrams/Player Creation/Project_Ilmatar_phase2_UML_Player_character_creation_2021_12_12.drawio b/UML Diagrams/Player Creation/Project_Ilmatar_phase2_UML_Player_character_creation_2021_12_12.drawio
new file mode 100644
index 0000000..9c82580
--- /dev/null
+++ b/UML Diagrams/Player Creation/Project_Ilmatar_phase2_UML_Player_character_creation_2021_12_12.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2021-12-12T18:35:32.286Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="VaSK1haIN5b2MxZJI0Xa" version="14.5.1" type="device"><diagram id="TgJZU2NuXZWPm2Dk2dgv" name="Page-1">7VZdb9owFP01kbaHTvkAxiuEfknt1o1J3R5d50K8OrmZbQr01+86cRJCCqLTqr1MQij33OMb+55jO14UZ5tLxYr0FhOQXugnGy+aeWE4ikL6t8C2AoZ+UAFLJZIK2gHm4hkc6Dt0JRLQHaJBlEYUXZBjngM3HYwphesubYGy+9aCLaEHzDmTffReJCat0PHQb/ErEMu0fnPgu0zGarIDdMoSXO9A0bkXxQrRVE/ZJgZpe1f3pRp3cSDbTExBbk4ZcP99srn+wceDqy9jnGx/TuXV85mr8sTkyi2Yp0wxbkDdKeSgtZu82dYd0WuRSZZTNF1gbuYuE1DMpFjm9MxpSqAIeAJlBDVz4hIGC0J5KmRyw7a4shPXhvHHOpqmqMQzlWXS1aS0Ms4X4ajDmNuRBPuEKtDEuau7EexBt2zTId4wbRzAUUpWaPHQLCNjainyKRqDmSO5NtFyYHOw/0GjKu0GwAyM2hLFDQjHzghuJwQfXbxufRWMHJbueCqsicx5ednUbuWmB6f4K9QPe+p7IS3VvzaQvZNCm/deNHFxzwfUCVPqo/ARYpRIgs9yrIwhpNyDam9IWJiDztAF4yJf3pSc2aBFvrp2WAhp7EKWWykVSQK5VRUNM6yS0OpVoMhN2a7hlH7UwNj/MPSGNPGY4qCN6WfpysSY01qYKNUE8scarEdOk/7w5ur7welPZj5J/mjwRupHL6i/p7EUpXaVxvX5F/yRwBlJJaFV9JsVfHYW9FSP+qpHLygs2QPIO9TCCLT1VcXdU/5fiTs6cW+P30jbQU/bM3tJ1mf758J2TVe7m6coOHjWj1FgW2upF8QrG3uQ0RT7xDKoeNRiUm2PR/fIgu6RptiLpBlkwHJrp4OUeQFcgD7CiFfSrNSxucxAcyUKc3wy9YVuCdYx3ez90eyUriRtkCQ8XP8S8gSOLfX810qYrPRfe/w2jP8n8d/erOMTL2I/fPV2pbD9xCtzO9/J0flv</diagram></mxfile>
\ No newline at end of file
diff --git a/UML Diagrams/Turn Selction Process/project_ilmatar_phase2_uml_turn_selection_Process_noncombat_2021_12_05.drawio b/UML Diagrams/Turn Selction Process/project_ilmatar_phase2_uml_turn_selection_Process_noncombat_2021_12_05.drawio
new file mode 100644
index 0000000..c879637
--- /dev/null
+++ b/UML Diagrams/Turn Selction Process/project_ilmatar_phase2_uml_turn_selection_Process_noncombat_2021_12_05.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2021-12-05T19:51:19.191Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="o0wFioYhBqLi4hvHvsst" version="14.5.1" type="device"><diagram id="ZL6U0VmWjqUg80Nkdhev" name="Page-1">7VjZUtswFP0az8ADHS8J0Efi0IWBgZJ0+ixsxRaRJSMpJOHre2XJcbwBaRv6khnPxDq+Ws851zd2gjBbfRUoT294jKnju/HKCcaO7w9839GXG68NMPRcAySCxAbyKmBCXrAFy7AFibGsBSrOqSJ5HYw4YzhSNQwJwZf1sBmn9VlzlOAWMIkQbaO/SKxSg54P3Qr/hkmSljN7rn2SoTLYAjJFMV9uQcGlE4SCc2XuslWIqT678lxMvy89TzcLE5ip93R4nD9lP8jj9Orp9MJ/IvPJ1SI/saM8I7qwG5aYwjkSzm4Qg80Ju3i1Lk9ELklGEYPWaMaZmtgnHrQRJQmD+wiWBD2D0TMWisBhXtgHiueARimh8TVa84VeuFQompetUcoFeYFhEbVjwmOhrC7801rERPcE2AVUYAkxd+VpeA3oBq1qgddIKgtEnFKUS/Kw2UaGRELYiCvFMxtkjwm2g1e95+9tWAU3YJ5hJdYQUlphYIVgnVA2l5WsNlpJtyS1sQKyUk42Q29muwfKEEtgB9V0bn06r2M+z+ua77Q+HaLAJUMKj/iCxXJbY3CztdMKKpS3gwr9lgodH47cXUgsbnMFyjgiTB07wYUeCY7bd48imBV+H7QEipxw7OiVB56hS3cXiMU8mwme6YFCWH7RszFUo1OCMjwpPWDCYAn6vhn5EwaVJuKayPZIgsj5NAW9pZB0whRH862pdefOXlHKSYTDFOjEJnQE+Q4j1jIiSFEVBhF8jkNOOThuzLhxJqG0AZXmpHimeq0pcxQRllwXMeNBhdxbgWiIQ98ZLXJZSuIYM20rrpBCxkN6MzmHvRYKGo7gAp2F7qehM4SFh9D2qjZcOlyokDPYCyKFnTAYdIm1Sd/nvf7s1jbkui70twzouYN+A9assKvugw7dN0impCDPkFy+gbw/YjgDriiuKJ1qxscnXov2oE170EExRQ+Y3nFJjFPGwsQ2qP9f7HrBO/Pr+Z7IHbTIPbEpTZpU1JGCdESMIyKL9+9cv0PLZNGIKsaxeYolvWHmbY5jm8L60tkhs/xj7Z2/T3tn/p7EN2yJjz88Huq6j6jr/M8dicfteq8MXins/or90556qlaRHJUlyFYxFPrOhdsudL6HRVFyZDLHcaMsaUTflkJ7PUwnsCmi854C6pCRdsxIw51rnS5Nnu2r1Dk7lDp7I3fzzeEtdvdV6px3ljp34BwMG4vwoe74KCF01B1dQgh2rzugWX2rMn/8qw9+weVv</diagram></mxfile>
\ No newline at end of file
diff --git a/UML Diagrams/Turn Selection Process/Project_Ilmatar_Phase2_UML_TurnSelection_Process_simpleconflect_Resolution_2021_12_12.drawio b/UML Diagrams/Turn Selection Process/Project_Ilmatar_Phase2_UML_TurnSelection_Process_simpleconflect_Resolution_2021_12_12.drawio
new file mode 100644
index 0000000..62fa03c
--- /dev/null
+++ b/UML Diagrams/Turn Selection Process/Project_Ilmatar_Phase2_UML_TurnSelection_Process_simpleconflect_Resolution_2021_12_12.drawio	
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2021-12-12T19:26:21.217Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.5.1 Chrome/89.0.4389.82 Electron/12.0.1 Safari/537.36" etag="57FvzRRtS9PXzEakHu8s" version="14.5.1" type="device"><diagram id="BMEnI6LKSWZ2O5On9qOB" name="Page-1">7VZRb5swEP41SNtDJsAhSh8b0m4P6VY1lTbtzQUHrBgfMpcm6a/fGUwIoa3SSdFeJiHEfb6zfd/32cJjcbH7aniZ30EqlBf66c5jcy8MJyyktwX2DRD5QQNkRqYNdAQs5YtwoO/QjUxF1UtEAIWy7IMJaC0S7GHcGNj201ag+quWPBMDYJlwNUR/yhTzBp1Gfod/EzLL25UD340UvE12QJXzFLZHELvxWGwAsPkqdrFQlruWl6bu9o3Rw8aM0HhOwR3fPX//Ja7gUc9/3/q7tXpYjgLWTPPM1cZ1TEyulEzwjmtqzrjN475lpNrKQnFN0WwFGpduJKCYK5lp+k5oS1TJZs/CoCQyr90AQklokkuVLvgeNnbjFfJk3UazHIx8oWm5cnPSsEHni3DSy1jaSoJ9Qo2oKOe+ZSM4gaj5XuKCV+iABJTiZSWfDm0U3GRSzwARCpfkWKJ2xO5N/oODqnQaBBQCzZ5SXAFrjeBOwtSF285WbOyw/NhS4djZ2Vk5O0zdqU0fTvCPiD8eiD+i8F6YCjQRcW37U3xvTTDxQhZYJrqM8J0MMhGKCkW6XEu7qevaQ0bqbOAnYhRrnQ2sRQwKyDhzDY3BqPgEaj2mxArfdFhV8oTWWtQ583GHPDheLQRUu1L1kcxlmgpt3QHIkTdWsL2UIDXWvEczekie2P8SeRFtPKY46GJ6bLrBGDT1wmXtCkE+2wrrtfMs9M4hHRrLGckyf46RJhfzUTTw0UBlJWv1GpXbmzT4K4kLEkuJTtNHK/l8FAx0Z0Pd2SsaK/4k1D1UEiXY+U2Te6L9P5P36sx7YnopdSevqEvt+j82mNAan9r7gk5EdzXUQf8W+Pz/GrioT6bn+aS9Lj5gFAq7/5R67Ohnj938AQ==</diagram></mxfile>
\ No newline at end of file