diff --git a/Kodfodrasz.AoC.Year2024.Tests/Day9Tests.fs b/Kodfodrasz.AoC.Year2024.Tests/Day9Tests.fs
index 980639e..7802c67 100644
--- a/Kodfodrasz.AoC.Year2024.Tests/Day9Tests.fs
+++ b/Kodfodrasz.AoC.Year2024.Tests/Day9Tests.fs
@@ -74,11 +74,37 @@ let ``Answer 1 for example input`` () =
        let expected: Result<_, string> = Ok 1928L
        actual = expected @>
 
-[<Fact(Skip="TODO")>]
+[<Fact>]
+let ``Answer 2 for example input for 12345`` () =
+  let blocks = parseInput "12345" |> Result.get
+  // BLOCKS BEFORE: 0..111....22222
+  // BLOCKS AFTER : 0..111....22222
+  // POS          : 0123456789
+  // CHECKSUM     : 132 = 0 + 3 + 4 + 5+ 20 + 22 + 24 + 26 + 28
+  test <@  answer2 blocks = Ok 132L @>
+
+[<Fact>]
+let ``Answer 2 for example input for 1313165`` () =
+  let blocks = parseInput "1313165" |> Result.get
+  // BLOCKS BEFORE: 0...1...2......33333
+  // BLOCKS AFTER : 021      33333
+  // POS          : 00000000001111111111
+  //                01234567890123456789
+  // CHECKSUM     : 169 = 0 + 2 + 2 + 27 + 30 + 33 + 36 + 39
+  test <@  answer2 blocks = Ok 169L @>
+
+[<Fact>]
+let ``Answer 2 for example input for 9953877292941`` () =
+  let blocks = parseInput "9953877292941" |> Result.get
+  // https://www.reddit.com/r/adventofcode/comments/1haa13a/comment/m2aioi2/
+  // 00000000063333333.11111...22222222................444444444..555555555.....
+  test <@  answer2 blocks = Ok 5768L @>
+
+[<Fact>]
 let ``Answer 2 for example input`` () =
   let input = parseInput exampleInput
 
   test
     <@ let actual = Result.bind answer2 input
-       let expected: Result<_, string> = Ok 31L
+       let expected: Result<_, string> = Ok 2858L
        actual = expected @>
diff --git a/Kodfodrasz.AoC.Year2024/Day9.fs b/Kodfodrasz.AoC.Year2024/Day9.fs
index 585daba..f50fc2e 100644
--- a/Kodfodrasz.AoC.Year2024/Day9.fs
+++ b/Kodfodrasz.AoC.Year2024/Day9.fs
@@ -1,7 +1,6 @@
 module Kodfodrasz.AoC.Year2024.Day9
 
 open System
-open System.Text.RegularExpressions
 open Kodfodrasz.AoC
 open System.Collections.Generic
 
@@ -62,9 +61,9 @@ let checksum blocks =
   ) blocks
 
 let defrag1 blocks : Block array = 
-  let blocks = System.Collections.Generic.List<Block>(blocks :> Block seq)
-
+  let blocks = List<Block>(blocks :> Block seq)
   let cmp = BlockPosComparer()
+
   let mutable fragmented = true
   while fragmented do
     let firstFreeIdx = blocks.FindIndex(function
@@ -115,8 +114,91 @@ let answer1 (blocks : parsedInput) =
   |> checksum
   |> Ok
 
-let answer2 (data : parsedInput) =
-  failwith "TODO"
+let defrag2 blocks : Block array = 
+  let blocks = List<Block>(blocks :> Block seq)
+  let cmp = BlockPosComparer()
+  let freeMap = 
+    blocks
+    |> Seq.filter(function
+      | Free (pos, size) -> size > 0
+      | _ -> false)
+    |> Seq.groupBy(size)
+    |> Map.ofSeq
+    |> Map.map(fun k b -> 
+      let freeList = List<Block>(b)
+      freeList.Sort(cmp)
+      freeList
+    )
+    |> (fun m ->
+      let mutable map = m
+      for i in 0..9 do
+        if not (map.ContainsKey(i)) then
+          map <- map.Add(i, List<Block>())
+      map
+    )
+
+  let files =
+    blocks 
+    |> Seq.filter(function
+      | File(pos, size, id) -> true
+      | _ -> false)
+    |>  List<Block>
+  files.Sort(cmp)
+  files.Reverse()
+
+  let rec getFirstFit minSize maxPos = 
+    let freeMaybe = 
+      freeMap.Values
+      |> Seq.choose(Seq.tryHead)
+      |> Seq.filter(function
+          | Free (pos, size) -> size >= minSize && pos < maxPos
+          | _ -> false)
+      |> Seq.sortBy (pos)
+      |> Seq.tryHead
+
+    freeMaybe
+    |> Option.iter(fun free -> 
+      freeMap[size free].RemoveAt(0) |> ignore
+    )
+
+    freeMaybe
+
+  let defraggedFiles = 
+    files
+    |> Seq.map(fun file -> 
+      // find first fitting free space.
+      // check at the first fitting size, and try larger ones if there is none remaining
+      // only consider values which have lower pos than the file!
+      match (getFirstFit (size file) (pos file)) with
+      | None -> file
+      | Some free -> 
+          let moved = File(
+            pos free,
+            size file,
+            fid file
+          )
+          let remSize = size free - size file
+          if remSize > 0 then
+            freeMap[remSize].Add(Free(
+              pos free + size file,
+              remSize
+              )
+            )
+            freeMap[remSize].Sort()
+          moved
+    )
+
+  Seq.concat [ 
+    defraggedFiles;
+    (freeMap.Values |> Seq.collect (fun fmv -> fmv :> Block seq))]
+  |> Seq.sortBy pos
+  |> Seq.toArray
+
+let answer2 (blocks : parsedInput) =
+  blocks
+  |> defrag2
+  |> checksum
+  |> Ok
 
 type Solver() =
   inherit SolverBase("Disk Fragmenter")
diff --git a/run.sh b/run.sh
index 51203dc..ccd3df5 100755
--- a/run.sh
+++ b/run.sh
@@ -11,4 +11,4 @@ fi
 
 export AOC_SESSION_COOKIE
 export AOC_DATA_DIR=${AOC_DATA_DIR:=Input}
-dotnet run -c Release --no-launch-profile --project Kodfodrasz.AoC.Cli/Kodfodrasz.AoC.Cli.fsproj
+dotnet run -c Release --no-launch-profile --project Kodfodrasz.AoC.Cli/Kodfodrasz.AoC.Cli.fsproj $@