--- a/src/library/library.cc	Thu Nov 06 01:17:24 2025 -0500
+++ b/src/library/library.cc	Thu Nov 06 03:16:55 2025 -0500
@@ -13,6 +13,73 @@
 
 namespace Library {
 
+Database::Database()
+{
+	/* Do this immediately :) */
+	UpdateWatchers();
+}
+
+void Database::UpdateWatchers()
+{
+	/* TODO also need to remove unused watchers */
+	for (const auto &p : session.config.library.paths) {
+		if (watchers_.count(p))
+			continue;
+
+		watchers_[p].reset(Filesystem::GetRecursiveFilesystemWatcher(reinterpret_cast<void *>(this), p, Database::StaticEventHandler));
+	}
+}
+
+bool Database::GetPathAnimeAndEpisode(const std::string &basename, int *aid, int *ep)
+{
+	anitomy::Anitomy anitomy;
+	anitomy.Parse(basename);
+
+	const auto &elements = anitomy.elements();
+
+	const std::string title = Strings::ToUtf8String(elements.get(anitomy::kElementAnimeTitle));
+
+	const int id = Anime::db.LookupAnimeTitle(title);
+	if (id <= 0 || (find_id_ && find_id_.value() != id))
+		return false;
+
+	const int episode =
+	    Strings::ToInt<int>(Strings::ToUtf8String(elements.get(anitomy::kElementEpisodeNumber)));
+
+	*aid = id;
+	*ep = episode;
+	return true;
+}
+
+void Database::EventHandler(const std::filesystem::path &path, Filesystem::IWatcher::Event event)
+{
+	std::string bname = path.filename().u8string();
+	int aid, ep;
+
+	std::cout << path << '\n';
+
+	if (!GetPathAnimeAndEpisode(bname, &aid, &ep))
+		return;
+
+	switch (event) {
+	case Filesystem::IWatcher::Created:
+		items[aid][ep] = path;
+		break;
+	case Filesystem::IWatcher::Deleted:
+		/* kill it off */
+		items[aid].erase(ep);
+		if (items[aid].empty())
+			items.erase(aid);
+		break;
+	}
+}
+
+void Database::StaticEventHandler(void *opaque, const std::filesystem::path &path, Filesystem::IWatcher::Event event)
+{
+	/* Forward to class function */
+	reinterpret_cast<Database *>(opaque)->EventHandler(path, event);
+}
+
 std::optional<std::filesystem::path> Database::GetAnimeFolder(int id)
 {
 	// this function sucks, but it's the most I can really do for now.
@@ -27,10 +94,8 @@
 		if (id != anime_id)
 			continue;
 
-		for (const auto &[episode, path] : episodes) {
+		for (const auto &[episode, path] : episodes)
 			return path.parent_path();
-			break;
-		}
 
 		break;
 	}
@@ -38,36 +103,15 @@
 	return std::nullopt;
 }
 
+/* TODO shove this into a separate thread; currently it blocks */
 void Database::Refresh(std::optional<int> find_id)
 {
-	items.clear();
-
-	for (const auto &folder : session.config.library.paths) {
-		for (const auto &entry : std::filesystem::recursive_directory_iterator(folder)) {
-			const std::filesystem::path path = entry.path();
-			if (!std::filesystem::is_regular_file(path))
-				continue;
-
-			const std::string basename = path.filename().u8string();
-
-			anitomy::Anitomy anitomy;
-			anitomy.Parse(basename);
+	find_id_ = find_id;
 
-			const auto &elements = anitomy.elements();
-
-			const std::string title = Strings::ToUtf8String(elements.get(anitomy::kElementAnimeTitle));
-
-			const int id = Anime::db.LookupAnimeTitle(title);
-			if (id <= 0 || (find_id && find_id.value() != id))
-				continue;
+	UpdateWatchers();
 
-			const int episode =
-			    Strings::ToInt<int>(Strings::ToUtf8String(elements.get(anitomy::kElementEpisodeNumber)));
-
-			// we have an ID now!
-			items[id][episode] = path;
-		}
-	}
+	for (const auto &w : watchers_)
+		w.second->Process();
 }
 
 void Database::Refresh()