diff --git a/hs/src/Aoc/Y2020/D16.hs b/hs/src/Aoc/Y2020/D16.hs
index 30132b4..da3a151 100644
--- a/hs/src/Aoc/Y2020/D16.hs
+++ b/hs/src/Aoc/Y2020/D16.hs
@@ -5,9 +5,12 @@ module Aoc.Y2020.D16
   ) where
 
 import           Control.Monad
+import           Data.Bifunctor
+import           Data.List
 
-import qualified Data.Map      as Map
-import qualified Data.Text     as T
+import qualified Data.Map       as Map
+import qualified Data.Set       as Set
+import qualified Data.Text      as T
 
 import           Aoc.Day
 import           Aoc.Parse
@@ -37,16 +40,41 @@ parser = do
 valid :: Int -> [(Int, Int)] -> Bool
 valid n = any (\(a, b) -> a <= n && n <= b)
 
-findValid :: Map.Map T.Text [(Int, Int)] -> Int -> [T.Text]
-findValid fields n = map fst $ filter (valid n . snd) $ Map.toList fields
+findValid :: Map.Map T.Text [(Int, Int)] -> Int -> Set.Set T.Text
+findValid fields n = Set.fromList $ map fst $ filter (valid n . snd) $ Map.toList fields
 
 anyValid :: Map.Map T.Text [(Int, Int)] -> Int -> Bool
-anyValid fields = not . null . findValid fields
+anyValid fields = not . Set.null . findValid fields
+
+anyOf :: [a] -> [(a, [a])]
+anyOf []     = []
+anyOf (a:as) = (a, as) : map (second (a:)) (anyOf as)
+
+findFields :: [(a, Set.Set T.Text)] -> [[(a, T.Text)]]
+findFields [] = pure []
+findFields variants = do
+  ((index, names), rest) <- anyOf variants
+  case Set.toList names of
+    [name] -> do
+      let rest' = map (second $ Set.delete name) rest
+      ((index, name) :) <$> findFields rest'
+    _ -> []
 
 solver :: Input -> IO ()
-solver i = do
+solver input = do
+  let Input fields ownTicket nearbyTickets = input
+
   putStrLn ">> Part 1"
-  print $ sum $ filter (not . anyValid (iFields i)) $ concat $ iNearbyTickets i
+  print $ sum $ filter (not . anyValid fields) $ concat nearbyTickets
+
+  putStrLn ""
+  putStrLn ">> Part 2"
+  let validTickets = filter (all (anyValid fields)) nearbyTickets
+      possibleFields = map (foldr1 Set.intersection) $ transpose $ map (map (findValid fields)) validTickets
+      actualFields = Map.fromList $ head $ findFields $ zip [(0::Int)..] possibleFields
+      namedOwnValues = zipWith (\i v -> (actualFields Map.! i, v)) [0..] ownTicket
+      relevantOwnValues = map snd $ filter (T.isPrefixOf "departure" . fst) namedOwnValues
+  print $ product relevantOwnValues
 
 day :: Day
 day = dayParse parser solver