diff --git a/default.nix b/default.nix
index 65d402f..9053e46 100644
--- a/default.nix
+++ b/default.nix
@@ -59,6 +59,6 @@ pkgs.stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/nix-software-center --prefix PATH : '${lib.makeBinPath [ pkgs.gnome-console ]}'
+    wrapProgram $out/bin/nix-software-center --prefix PATH : '${lib.makeBinPath [ pkgs.gnome-console pkgs.sqlite ]}'
   '';
 }
diff --git a/src/parse/cache.rs b/src/parse/cache.rs
deleted file mode 100644
index f79b43c..0000000
--- a/src/parse/cache.rs
+++ /dev/null
@@ -1,546 +0,0 @@
-use ijson::IString;
-use log::*;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::{
-    collections::HashMap,
-    env,
-    error::Error,
-    fs::{self, File},
-    io::{BufReader, Read, Write},
-    path::Path,
-    process::Command,
-};
-
-use crate::ui::window::{SystemPkgs, UserPkgs};
-
-use super::config::NscConfig;
-
-#[derive(Serialize, Deserialize, Debug)]
-struct NewPackageBase {
-    packages: HashMap<String, NewPackage>,
-}
-
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
-struct NewPackage {
-    version: IString,
-}
-
-pub fn checkcache(
-    syspkgs: SystemPkgs,
-    userpkgs: UserPkgs,
-    config: NscConfig,
-) -> Result<(), Box<dyn Error>> {
-    match syspkgs {
-        SystemPkgs::Legacy => {
-            setuplegacypkgscache()?;
-            setupupdatecache()?;
-            setupnewestver()?;
-        }
-        SystemPkgs::Flake => {
-            setupflakepkgscache(config)?;
-        }
-        SystemPkgs::None => {
-            if userpkgs == UserPkgs::Profile {
-                getlatestpkgs().unwrap();
-            }
-        }
-    }
-
-    if userpkgs == UserPkgs::Env && syspkgs != SystemPkgs::Legacy {
-        setupupdatecache()?;
-        setupnewestver()?;
-    }
-
-    if userpkgs == UserPkgs::Profile {
-        setupprofilepkgscache()?;
-    }
-    Ok(())
-}
-
-pub fn uptodatelegacy() -> Result<Option<(String, String)>, Box<dyn Error>> {
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    let oldversion = fs::read_to_string(format!("{}/sysver.txt", cachedir))?
-        .trim()
-        .to_string();
-    let newversion = fs::read_to_string(format!("{}/chnver.txt", cachedir))?
-        .trim()
-        .to_string();
-    if oldversion == newversion {
-        info!("System is up to date");
-        Ok(None)
-    } else {
-        Ok(Some((oldversion, newversion)))
-    }
-}
-
-pub fn uptodateflake() -> Result<Option<(String, String)>, Box<dyn Error>> {
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    let oldversion = fs::read_to_string(format!("{}/flakever.txt", cachedir))?
-        .trim()
-        .to_string();
-    let newversion = fs::read_to_string(format!("{}/newver.txt", cachedir))?
-        .trim()
-        .to_string();
-    if oldversion == newversion {
-        info!("System is up to date");
-        Ok(None)
-    } else {
-        info!("OLD {:?} != NEW {:?}", oldversion, newversion);
-        if let (Some(oldv), Some(newv)) = (oldversion.get(..8), newversion.get(..8)) {
-            Ok(Some((oldv.to_string(), newv.to_string())))
-        } else {
-            Ok(Some((oldversion, newversion)))
-        }
-    }
-}
-
-pub fn channelver() -> Result<Option<(String, String)>, Box<dyn Error>> {
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    let oldversion = fs::read_to_string(format!("{}/chnver.txt", cachedir))?
-        .trim()
-        .to_string();
-    let newversion = fs::read_to_string(format!("{}/newver.txt", cachedir))?
-        .trim()
-        .to_string();
-    if oldversion == newversion {
-        info!("Channels match");
-        Ok(None)
-    } else {
-        info!("chnver {:?} != newver {:?}", oldversion, newversion);
-        Ok(Some((oldversion, newversion)))
-    }
-}
-
-pub fn flakever() -> Result<Option<(String, String)>, Box<dyn Error>> {
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    let oldversion = fs::read_to_string(format!("{}/flakever.txt", cachedir))?
-        .trim()
-        .to_string();
-    let newversion = fs::read_to_string(format!("{}/newver.txt", cachedir))?
-        .trim()
-        .to_string();
-    if oldversion == newversion {
-        info!("Flake hashes match");
-        Ok(None)
-    } else {
-        info!("flakever {:?} != newver {:?}", oldversion, newversion);
-        Ok(Some((oldversion, newversion)))
-    }
-}
-
-fn getlatestpkgs() -> Result<(), Box<dyn Error>> {
-    let vout = Command::new("nixos-version").arg("--json").output()?;
-
-    let versiondata: Value = serde_json::from_str(&String::from_utf8_lossy(&vout.stdout))?;
-    let dlver = versiondata.get("nixosVersion").unwrap().as_str().unwrap();
-
-    let mut relver = dlver.split('.').collect::<Vec<&str>>()[0..2].join(".")[0..5].to_string();
-    if relver == "22.11" {
-        relver = "unstable".to_string();
-    }
-
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    info!("Relver {}", relver);
-    let url = format!(
-        "https://channels.nixos.org/nixos-{}/packages.json.br",
-        relver.trim()
-    );
-
-    // Check newest nixpkgs version
-    let revurl = format!("https://channels.nixos.org/nixos-{}/git-revision", relver);
-    let response = reqwest::blocking::get(revurl)?;
-    let mut dl = false;
-    if response.status().is_success() {
-        let newrev = response.text()?;
-        info!("NEW REV: {}", newrev);
-        if Path::new(&format!("{}/newver.txt", &cachedir)).exists() {
-            let oldrev = fs::read_to_string(&format!("{}/newver.txt", &cachedir))?;
-            if oldrev != newrev {
-                dl = true;
-            }
-        } else {
-            dl = true;
-        }
-        let mut sysver = fs::File::create(format!("{}/newver.txt", &cachedir))?;
-        sysver.write_all(newrev.as_bytes())?;
-    } else {
-        error!("Failed to get newest nixpkgs version");
-    }
-
-    let outfile = format!("{}/packages.json", &cachedir);
-    if dl {
-        dlfile(&url, &outfile)?;
-    }
-
-    Ok(())
-}
-
-fn setuplegacypkgscache() -> Result<(), Box<dyn Error>> {
-    info!("Setting up legacy package cache");
-    let vout = Command::new("nix-instantiate")
-        .arg("-I")
-        .arg("nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos")
-        .arg("<nixpkgs/lib>")
-        .arg("-A")
-        .arg("version")
-        .arg("--eval")
-        .arg("--json")
-        .output()?;
-
-    let dlver = String::from_utf8_lossy(&vout.stdout)
-        .to_string()
-        .replace('"', "")
-        .trim()
-        .to_string();
-
-    let mut relver = dlver.split('.').collect::<Vec<&str>>().join(".")[0..5]
-        .trim()
-        .to_string();
-
-    if dlver.len() >= 8 && &dlver[5..8] == "pre" {
-        relver = "unstable".to_string();
-    }
-
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    let url = format!(
-        "https://releases.nixos.org/nixos/{}/nixos-{}/packages.json.br",
-        relver.trim(),
-        dlver.trim()
-    );
-
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    if !Path::new(&cachedir).exists() {
-        fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    }
-
-    if !Path::new(&format!("{}/chnver.txt", &cachedir)).exists() {
-        let mut sysver = fs::File::create(format!("{}/chnver.txt", &cachedir))?;
-        sysver.write_all(dlver.as_bytes())?;
-    }
-
-    if Path::new(format!("{}/chnver.txt", &cachedir).as_str()).exists()
-        && fs::read_to_string(&Path::new(format!("{}/chnver.txt", &cachedir).as_str()))?.trim()
-            == dlver
-        && Path::new(format!("{}/packages.json", &cachedir).as_str()).exists()
-    {
-        return Ok(());
-    } else {
-        let oldver = fs::read_to_string(&Path::new(format!("{}/chnver.txt", &cachedir).as_str()))?;
-        let sysver = &dlver;
-        info!("OLD: {}, != NEW: {}", oldver.trim(), sysver.trim());
-    }
-    if Path::new(format!("{}/chnver.txt", &cachedir).as_str()).exists() {
-        fs::remove_file(format!("{}/chnver.txt", &cachedir).as_str())?;
-    }
-    let mut sysver = fs::File::create(format!("{}/chnver.txt", &cachedir))?;
-    sysver.write_all(dlver.as_bytes())?;
-    let outfile = format!("{}/packages.json", &cachedir);
-    dlfile(&url, &outfile)?;
-    Ok(())
-}
-
-fn setupflakepkgscache(config: NscConfig) -> Result<(), Box<dyn Error>> {
-    info!("Setting up flake cache");
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-
-    // First remove legacy files
-    if Path::new(format!("{}/chnver.txt", &cachedir).as_str()).exists() {
-        fs::remove_file(format!("{}/chnver.txt", &cachedir).as_str())?;
-    }
-
-    let vout = Command::new("nixos-version").arg("--json").output()?;
-
-    let versiondata: Value = serde_json::from_str(&String::from_utf8_lossy(&vout.stdout))?;
-    let rev = versiondata
-        .get("nixpkgsRevision")
-        .unwrap()
-        .as_str()
-        .unwrap_or("unknown");
-    let dlver = versiondata.get("nixosVersion").unwrap().as_str().unwrap();
-
-    let mut relver = dlver.split('.').collect::<Vec<&str>>()[0..2].join(".");
-    if relver == "22.11" {
-        relver = "unstable".to_string();
-    }
-
-    fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    let url = format!(
-        "https://channels.nixos.org/nixos-{}/packages.json.br",
-        relver.trim()
-    );
-
-    fn writesyspkgs(outfile: &str, inputpath: &str) -> Result<(), Box<dyn Error>> {
-        let output = Command::new("nix")
-            .arg("search")
-            .arg("--inputs-from")
-            .arg(inputpath)
-            .arg("nixpkgs")
-            .arg("--json")
-            .output()?;
-        let mut file = fs::File::create(outfile)?;
-        file.write_all(&output.stdout)?;
-        Ok(())
-    }
-
-    let flakepath = config
-        .flake
-        .map(|x| {
-            x.strip_suffix("/flake.nix")
-                .unwrap_or(x.as_str())
-                .to_string()
-        })
-        .unwrap_or_else(|| String::from("/etc/nixos"));
-    if !Path::new(&format!("{}/flakever.txt", &cachedir)).exists() {
-        let mut sysver = fs::File::create(format!("{}/flakever.txt", &cachedir))?;
-        sysver.write_all(rev.as_bytes())?;
-        writesyspkgs(&format!("{}/syspackages.json", &cachedir), &flakepath)?;
-    } else {
-        let oldver =
-            fs::read_to_string(&Path::new(format!("{}/flakever.txt", &cachedir).as_str()))?;
-        let sysver = rev;
-        if oldver != sysver {
-            info!("OLD FLAKEVER: {}, != NEW: {}", oldver, sysver);
-            let mut sysver = fs::File::create(format!("{}/flakever.txt", &cachedir))?;
-            sysver.write_all(rev.as_bytes())?;
-            writesyspkgs(&format!("{}/syspackages.json", &cachedir), &flakepath)?;
-        }
-    }
-
-    if !Path::new(&format!("{}/syspackages.json", &cachedir)).exists() {
-        writesyspkgs(&format!("{}/syspackages.json", &cachedir), &flakepath)?;
-    }
-
-    // Check newest nixpkgs version
-    let revurl = format!("https://channels.nixos.org/nixos-{}/git-revision", relver);
-    let response = reqwest::blocking::get(revurl)?;
-    let mut dl = false;
-    if response.status().is_success() {
-        let newrev = response.text()?;
-        info!("NEW REV: {}", newrev);
-        if Path::new(&format!("{}/newver.txt", &cachedir)).exists() {
-            let oldrev = fs::read_to_string(&format!("{}/newver.txt", &cachedir))?;
-            if oldrev != newrev {
-                dl = true;
-            }
-        } else {
-            dl = true;
-        }
-        let mut sysver = fs::File::create(format!("{}/newver.txt", &cachedir))?;
-        sysver.write_all(newrev.as_bytes())?;
-    }
-
-    let outfile = format!("{}/packages.json", &cachedir);
-    if dl {
-        dlfile(&url, &outfile)?;
-    }
-    Ok(())
-}
-
-fn setupprofilepkgscache() -> Result<(), Box<dyn Error>> {
-    info!("Setting up profile package cache");
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-
-    // First remove legacy files
-    if Path::new(format!("{}/chnver.txt", &cachedir).as_str()).exists() {
-        fs::remove_file(format!("{}/chnver.txt", &cachedir).as_str())?;
-    }
-
-    fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    let url = "https://channels.nixos.org/nixpkgs-unstable/packages.json.br".to_string();
-
-    // Check nix profile nixpkgs version
-    let client = reqwest::blocking::Client::builder()
-        .user_agent("request")
-        .build()?;
-    let response = client
-        .get("https://api.github.com/repos/NixOS/nixpkgs/commits/nixpkgs-unstable")
-        .send()?;
-    if response.status().is_success() {
-        let profilerevjson = response.text()?;
-        let profilerevdata: Value = serde_json::from_str(&profilerevjson)?;
-        let profilerev = profilerevdata.get("sha").unwrap().as_str().unwrap();
-        info!("PROFILE REV {}", profilerev);
-
-        if !Path::new(&format!("{}/profilever.txt", &cachedir)).exists() {
-            let mut sysver = fs::File::create(format!("{}/profilever.txt", &cachedir))?;
-            sysver.write_all(profilerev.as_bytes())?;
-            dlfile(&url, &format!("{}/profilepackages.json", &cachedir))?;
-        } else {
-            let oldver =
-                fs::read_to_string(&Path::new(format!("{}/profilever.txt", &cachedir).as_str()))?;
-            let sysver = profilerev;
-            if oldver != sysver {
-                info!("OLD PROFILEVER: {}, != NEW: {}", oldver, sysver);
-                let mut sysver = fs::File::create(format!("{}/profilever.txt", &cachedir))?;
-                sysver.write_all(profilerev.as_bytes())?;
-                dlfile(&url, &format!("{}/profilepackages.json", &cachedir))?;
-            } else {
-                info!("PROFILEVER UP TO DATE");
-            }
-        }
-    }
-    Ok(())
-}
-
-// nix-instantiate --eval -E '(builtins.getFlake "/home/user/nix").inputs.nixpkgs.outPath'
-// nix-env -f /nix/store/sjmq1gphj1arbzf4aqqnygd9pf4hkfkf-source -qa --json > packages.json
-fn setupupdatecache() -> Result<(), Box<dyn Error>> {
-    info!("Setting up update cache");
-    let output = Command::new("nix-instantiate")
-        .arg("--eval")
-        .arg("-E")
-        .arg("with import <nixpkgs> {}; pkgs.lib.version")
-        .output()?;
-    let dlver = String::from_utf8(output.stdout)?
-        .replace("\"", "")
-        .trim()
-        .to_string();
-
-    let mut relver = dlver.split('.').collect::<Vec<&str>>().join(".")[0..5]
-        .trim()
-        .to_string();
-
-    if dlver.len() >= 8 && &dlver[5..8] == "pre" {
-        relver = "unstable".to_string();
-    }
-
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    let url = format!(
-        "https://releases.nixos.org/nixos/{}/nixos-{}/packages.json.br",
-        relver.trim(),
-        dlver.trim()
-    );
-
-    let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-    if !Path::new(&cachedir).exists() {
-        fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-    }
-
-    if !Path::new(&format!("{}/sysver.txt", &cachedir)).exists() {
-        let mut sysver = fs::File::create(format!("{}/sysver.txt", &cachedir))?;
-        sysver.write_all(dlver.as_bytes())?;
-    }
-
-    if Path::new(format!("{}/sysver.txt", &cachedir).as_str()).exists()
-        && fs::read_to_string(&Path::new(format!("{}/sysver.txt", &cachedir).as_str()))?.trim()
-            == dlver
-        && Path::new(format!("{}/syspackages.json", &cachedir).as_str()).exists()
-    {
-        return Ok(());
-    } else {
-        let oldver = fs::read_to_string(&Path::new(format!("{}/sysver.txt", &cachedir).as_str()))?;
-        let sysver = &dlver;
-        info!("OLD: {}, != NEW: {}", oldver.trim(), sysver.trim());
-    }
-    if Path::new(format!("{}/sysver.txt", &cachedir).as_str()).exists() {
-        fs::remove_file(format!("{}/sysver.txt", &cachedir).as_str())?;
-    }
-    let mut sysver = fs::File::create(format!("{}/sysver.txt", &cachedir))?;
-    sysver.write_all(dlver.as_bytes())?;
-    let outfile = format!("{}/syspackages.json", &cachedir);
-    dlfile(&url, &outfile)?;
-    let file = File::open(&outfile)?;
-    let reader = BufReader::new(file);
-    let pkgbase: NewPackageBase = simd_json::serde::from_reader(reader)?;
-    let mut outbase = HashMap::new();
-    for (pkg, ver) in pkgbase.packages {
-        outbase.insert(pkg.clone(), ver.version.clone());
-    }
-    let out = simd_json::serde::to_string(&outbase)?;
-    fs::write(&outfile, out)?;
-    Ok(())
-}
-
-fn setupnewestver() -> Result<(), Box<dyn Error>> {
-    let output = Command::new("nix-instantiate")
-        .arg("--eval")
-        .arg("-E")
-        .arg("with import <nixpkgs> {}; pkgs.lib.version")
-        .output()?;
-    let version = String::from_utf8(output.stdout)?.replace("\"", "");
-    let mut relver = version.split('.').collect::<Vec<&str>>().join(".")[0..5].to_string();
-
-    if version.len() >= 8 && &version[5..8] == "pre" {
-        relver = "unstable".to_string();
-    }
-    let response = reqwest::blocking::get(format!("https://channels.nixos.org/nixos-{}", relver))?;
-    if let Some(latest) = response.url().to_string().split('/').last() {
-        let latest = latest.strip_prefix("nixos-").unwrap_or(latest);
-        let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-        if !Path::new(&cachedir).exists() {
-            fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-        }
-
-        if !Path::new(format!("{}/newver.txt", &cachedir).as_str()).exists() {
-            let mut newver = fs::File::create(format!("{}/newver.txt", &cachedir))?;
-            newver.write_all(latest.as_bytes())?;
-        }
-
-        if Path::new(format!("{}/newver.txt", &cachedir).as_str()).exists()
-            && fs::read_to_string(&Path::new(format!("{}/newver.txt", &cachedir).as_str()))?
-                == latest
-        {
-            return Ok(());
-        } else {
-            let oldver =
-                fs::read_to_string(&Path::new(format!("{}/newver.txt", &cachedir).as_str()))?;
-            let newver = latest;
-            info!("OLD: {}, != NEW: {}", oldver, newver);
-        }
-        if Path::new(format!("{}/newver.txt", &cachedir).as_str()).exists() {
-            fs::remove_file(format!("{}/newver.txt", &cachedir).as_str())?;
-        }
-        let mut newver = fs::File::create(format!("{}/newver.txt", &cachedir))?;
-        newver.write_all(latest.as_bytes())?;
-    }
-    Ok(())
-}
-
-fn dlfile(url: &str, path: &str) -> Result<(), Box<dyn Error>> {
-    trace!("Downloading {}", url);
-    let response = reqwest::blocking::get(url)?;
-    if response.status().is_success() {
-        let cachedir = format!("{}/.cache/nix-software-center", env::var("HOME")?);
-        if !Path::new(&cachedir).exists() {
-            fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
-        }
-
-        let dst: Vec<u8> = response.bytes()?.to_vec();
-        {
-            let mut file = File::create(path)?;
-            let mut reader = brotli::Decompressor::new(
-                dst.as_slice(),
-                4096, // buffer size
-            );
-            let mut buf = [0u8; 4096];
-            loop {
-                match reader.read(&mut buf[..]) {
-                    Err(e) => {
-                        if let std::io::ErrorKind::Interrupted = e.kind() {
-                            continue;
-                        }
-                        return Err(Box::new(e));
-                    }
-                    Ok(size) => {
-                        if size == 0 {
-                            break;
-                        }
-                        file.write_all(&buf[..size])?
-                    }
-                }
-            }
-        }
-    } else {
-        error!("Failed to download {}", url);
-        return Err(Box::new(std::io::Error::new(
-            std::io::ErrorKind::InvalidData,
-            "Failed to download file",
-        )))
-    }
-    trace!("Finished downloading {} -> {}", url, path);
-    Ok(())
-}
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index d06be6d..03e6d1b 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -1,3 +1,2 @@
-// pub mod cache;
 pub mod packages;
 pub mod config;
\ No newline at end of file
diff --git a/src/ui/windowloading.rs b/src/ui/windowloading.rs
index 566d984..7d09789 100644
--- a/src/ui/windowloading.rs
+++ b/src/ui/windowloading.rs
@@ -38,7 +38,13 @@ impl Worker for WindowAsyncHandler {
                     let mut catpicks: HashMap<PkgCategory, Vec<String>> = HashMap::new();
                     let mut catpkgs: HashMap<PkgCategory, Vec<String>> = HashMap::new();
 
-                    let pkgdb = nix_data::cache::nixos::nixospkgs().await.unwrap();
+                    let pkgdb = match nix_data::cache::nixos::nixospkgs().await {
+                        Ok(p) => p,
+                        Err(e) => {
+                            error!("Error getting NixOS pkgs: {}", e);
+                            return;
+                        }
+                    };
                     let pool = SqlitePool::connect(&format!("sqlite://{}", pkgdb))
                         .await
                         .unwrap();