diff --git a/src/Day9.hs b/src/Day9.hs
index 4bd226d..c89b5b8 100644
--- a/src/Day9.hs
+++ b/src/Day9.hs
@@ -1,45 +1,71 @@
 module Day9 (partOne, partTwo) where
 
 import Data.Char (digitToInt, isDigit)
+import Data.Maybe
 
 type FileId = Int
 
-data Block = File FileId | Free
+type Space = Int
+
+type Position = Int
+
+data Block = FileBlock Position FileId | FreeBlock Position
   deriving (Show, Eq)
 
+data Object = File Position Space FileId | FreeSpace Position Space
+
 partOne :: String -> Int
-partOne input = sum $ zipWith (*) [0 ..] $ compactFiles $ parseDisk input
+partOne input = calculateCheckSum compactFiles
+  where
+    blocks = concatMap getBlocks $ parseDisk input
+
+    compactFiles :: [Block]
+    compactFiles = go blocks (reverse blocks) []
+      where
+        go [] _ acc = reverse acc
+        go _ [] acc = reverse acc
+        go (lBlock : xs) (rBlock : ys) acc
+          | lIndex > rIndex = reverse acc
+          | otherwise = case (lBlock, rBlock) of
+              (FileBlock _ _, _) -> go xs (rBlock : ys) (lBlock : acc)
+              (FreeBlock _, FileBlock _ _) -> go xs ys (rBlock : acc)
+              (FreeBlock _, FreeBlock _) -> go (lBlock : xs) ys acc
+          where
+            lIndex = getBlockPosition lBlock
+            rIndex = getBlockPosition rBlock
 
 partTwo :: String -> Int
 partTwo _ = 0
 
--- Compacting
-compactFiles :: [Block] -> [FileId]
-compactFiles blocks = go enumeratedBlocks (reverse enumeratedBlocks) []
-  where
-    enumeratedBlocks :: [(Int, Block)]
-    enumeratedBlocks = zip [0 ..] blocks
+-- Blocks & Objects
 
-    go [] _ acc = reverse acc
-    go _ [] acc = reverse acc
-    go ((lIndex, lBlock) : xs) ((rIndex, rBlock) : ys) acc
-      | lIndex > rIndex = reverse acc
-      | otherwise = case (lBlock, rBlock) of
-          (File fileId, _) -> go xs ((rIndex, rBlock) : ys) (fileId : acc)
-          (Free, File fileId) -> go xs ys (fileId : acc)
-          (Free, Free) -> go ((lIndex, lBlock) : xs) ys acc
+calculateCheckSum :: [Block] -> Int
+calculateCheckSum blocks = sum $ zipWith ((*) . fromMaybe 0 . getFileId) blocks [0 ..]
+
+getBlocks :: Object -> [Block]
+getBlocks (File position space fileId) = map (`FileBlock` fileId) [position .. (position + space - 1)]
+getBlocks (FreeSpace position space) = map FreeBlock [position .. (position + space - 1)]
+
+getFileId :: Block -> Maybe FileId
+getFileId (FileBlock _ fileId) = Just fileId
+getFileId _ = Nothing
+
+getBlockPosition :: Block -> Position
+getBlockPosition (FileBlock pos _) = pos
+getBlockPosition (FreeBlock pos) = pos
 
 -- Parsing
 
 data ParseStep = ParseFile | ParseFree
 
-parseDisk :: String -> [Block]
-parseDisk input = go (parseInts input) ParseFile 0 []
+parseDisk :: String -> [Object]
+parseDisk input = go (parseInts input) ParseFile 0 0 []
   where
-    go [] _ _id acc = reverse acc
-    go (space : xs) _ fileId [] = go xs ParseFree (fileId + 1) (replicate space (File fileId))
-    go (space : xs) ParseFree fileId acc = go xs ParseFile fileId (replicate space Free ++ acc)
-    go (space : xs) ParseFile fileId acc = go xs ParseFree (fileId + 1) (replicate space (File fileId) ++ acc)
+    go :: [Int] -> ParseStep -> FileId -> Position -> [Object] -> [Object]
+    go [] _ _ _ acc = reverse acc
+    go (space : xs) _ fileId position [] = go xs ParseFree (fileId + 1) (position + space) [File position space fileId]
+    go (space : xs) ParseFree fileId position acc = go xs ParseFile fileId (position + space) (FreeSpace position space : acc)
+    go (space : xs) ParseFile fileId position acc = go xs ParseFree (fileId + 1) (position + space) (File position space fileId : acc)
 
     parseInts :: String -> [Int]
     parseInts = map digitToInt . filter isDigit