diff --git a/.idea/adventOfCode2019.iml b/.idea/adventOfCode2019.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/.idea/adventOfCode2019.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/justfile b/justfile
index 2a8f95b..b64b90f 100644
--- a/justfile
+++ b/justfile
@@ -3,3 +3,6 @@ run day part inputFile: build
 
 build:
     ./gradlew clean shadowJar
+
+help: build
+    java -jar ./build/libs/adventOfCode2019-1.0-SNAPSHOT-all.jar --help
diff --git a/src/main/kotlin/CliParser.kt b/src/main/kotlin/CliParser.kt
index 8dd99f3..707107f 100644
--- a/src/main/kotlin/CliParser.kt
+++ b/src/main/kotlin/CliParser.kt
@@ -3,6 +3,7 @@ import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.path
 import day1.Day1
+import day2.Day2
 import java.nio.file.Path
 import kotlin.RuntimeException
 
@@ -15,6 +16,8 @@ class CliParser: CliktCommand() {
         when(val it = "${dayToRun.replace("Day", "")}.${partToRun}") {
             "1.1" -> println(Day1().runPart1(inputFile))
             "1.2" -> println(Day1().runPart2(inputFile))
+            "2.1" -> println(Day2().runPart1(inputFile))
+            "2.2" -> println(Day2().runPart2(inputFile))
             else -> throw RuntimeException("Day or part (${it}) not implementation yet")
         }
     }
diff --git a/src/main/kotlin/day2/Day2.kt b/src/main/kotlin/day2/Day2.kt
index bab1dda..68d9cb3 100644
--- a/src/main/kotlin/day2/Day2.kt
+++ b/src/main/kotlin/day2/Day2.kt
@@ -4,9 +4,72 @@ import java.nio.file.Files
 import java.nio.file.Path
 
 class Day2 {
+    private lateinit var initialList: List<Int>
+    private lateinit var currentList: MutableList<Int>
+
+    fun runPart1(inputFile: Path): Int {
+        loadFile(inputFile)
+        return solve()
+    }
 
 
-    private fun loadFile(inputFile: Path): List<String> {
-        return Files.readAllLines(inputFile)
+    fun runPart2(inputFile: Path): Int {
+        loadFile(inputFile)
+        for (noun in 0..99) {
+            for (verb in 0..99) {
+                currentList[1] = noun
+                currentList[2] = verb
+                with(solve()) {
+                    if (this == 19690720) {
+                        return (100 * noun) + verb
+                    }
+                    else reset()
+                }
+            }
+        }
+        throw RuntimeException("Can't be found")
+    }
+
+    private fun solve(): Int {
+        var index = 0
+        while ( true ) {
+            when (currentList[index]) {
+                1 -> {
+                    val firstCoord = currentList[index + 1]
+                    val secondCoord = currentList[index + 2]
+                    val outputCoord = currentList[index + 3]
+                    applyOperation(firstCoord, secondCoord, outputCoord) { a: Int, b: Int -> a + b }
+                }
+                2 -> {
+                    val firstCoord = currentList[index + 1]
+                    val secondCoord = currentList[index + 2]
+                    val outputCoord = currentList[index + 3]
+                    applyOperation(firstCoord, secondCoord, outputCoord) { a: Int, b: Int -> a * b }
+                }
+                99 -> {
+                    return currentList[0]
+                }
+                else -> throw RuntimeException("Error encountered")
+            }
+            index += 4
+        }
+    }
+    private fun reset(): Unit {
+        currentList = initialList.toMutableList()
+        println(currentList)
+    }
+
+    private fun applyOperation(
+        firstCoord: Int,
+        secondCoord: Int,
+        outputCoord: Int,
+        operation: (Int, Int) -> Int
+    ): Unit {
+        currentList[outputCoord] = operation(currentList[firstCoord], currentList[secondCoord])
+    }
+
+    private fun loadFile(inputFile: Path): Unit {
+        initialList = Files.newBufferedReader(inputFile).readLine().split(',').map { it.toInt() }
+        currentList = initialList.toMutableList()
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/day2example.txt b/src/main/resources/day2example.txt
new file mode 100644
index 0000000..d3e6587
--- /dev/null
+++ b/src/main/resources/day2example.txt
@@ -0,0 +1 @@
+1,9,10,3,2,3,11,0,99,30,40,50
\ No newline at end of file