Merge pull request 'clap' (#1) from clap into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/1

15 files changed, 1058 insertions, 816 deletions

diff --git a/src/apis/modrinth.rs b/src/apis/modrinth.rs
index bb5ee19..9afe7f3 100644
--- a/src/apis/modrinth.rs
+++ b/src/apis/modrinth.rs
@@ -2,7 +2,10 @@ use chrono::{DateTime, FixedOffset};
 use reqwest::Client;
 use serde::Deserialize;
 
-use crate::{Modloader, List, error::{MLE, MLError, ErrorType}};
+use crate::{
+    error::{ErrorType, MLError, MLE},
+    List, Modloader,
+};
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct Project {
@@ -47,7 +50,7 @@ pub struct ModeratorMessage {
 pub enum Side {
     required,
     optional,
-    unsupported
+    unsupported,
 }
 
 #[allow(non_camel_case_types)]
@@ -55,7 +58,7 @@ pub enum Side {
 pub enum Type {
     r#mod,
     modpack,
-    recourcepack
+    recourcepack,
 }
 
 #[allow(non_camel_case_types)]
@@ -63,9 +66,11 @@ pub enum Type {
 pub enum Status {
     approved,
     rejected,
-    draft, unlisted, archived,
+    draft,
+    unlisted,
+    archived,
     processing,
-    unknown
+    unknown,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -90,7 +95,7 @@ pub struct Version {
 pub enum VersionType {
     release,
     beta,
-    alpha
+    alpha,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -110,22 +115,19 @@ pub struct Hash {
 
 async fn get(api: &str, path: String) -> Result<Option<Vec<u8>>, Box<dyn std::error::Error>> {
     let url = format!(r#"{}{}"#, api, path);
-    
+
     let client = Client::builder()
-        .user_agent(format!("fxqnlr/modlistcli/{} ([email protected])", env!("CARGO_PKG_VERSION")))
+        .user_agent(format!(
+            "fxqnlr/modlistcli/{} ([email protected])",
+            env!("CARGO_PKG_VERSION")
+        ))
         .build()?;
-    let res = client.get(url)
-        .send()
-        .await?;
-    
+    let res = client.get(url).send().await?;
+
     let mut data: Option<Vec<u8>> = None;
 
     if res.status() == 200 {
-        data = Some(res
-            .bytes()
-            .await?
-            .to_vec()
-        );
+        data = Some(res.bytes().await?.to_vec());
     }
 
     Ok(data)
@@ -143,7 +145,7 @@ pub async fn projects(api: &str, ids: Vec<String>) -> Vec<Project> {
     let url = format!(r#"projects?ids=["{}"]"#, all);
 
     let data = get(api, url).await.unwrap().unwrap();
-    
+
     serde_json::from_slice(&data).unwrap()
 }
 
@@ -154,7 +156,10 @@ pub async fn versions(api: &str, id: String, list: List) -> Vec<Version> {
         Modloader::Fabric => String::from("fabric"),
     };
 
-    let url = format!(r#"project/{}/version?loaders=["{}"]&game_versions=["{}"]"#, id, loaderstr, list.mc_version);
+    let url = format!(
+        r#"project/{}/version?loaders=["{}"]&game_versions=["{}"]"#,
+        id, loaderstr, list.mc_version
+    );
 
     let data = get(api, url).await.unwrap();
 
@@ -185,7 +190,7 @@ pub fn extract_current_version(versions: Vec<Version>) -> MLE<String> {
             times.sort_by_key(|t| t.1);
             times.reverse();
             Ok(times[0].0.to_string())
-        },
+        }
         _ => panic!("available_versions should never be negative"),
     }
 }
@@ -205,16 +210,19 @@ pub struct MCVersion {
 }
 
 pub async fn get_minecraft_version(api: &str, version: MCVersionType) -> String {
-    let data = get(api, String::from("tag/game_version")).await.unwrap().unwrap();
+    let data = get(api, String::from("tag/game_version"))
+        .await
+        .unwrap()
+        .unwrap();
     let mc_versions: Vec<MCVersion> = serde_json::from_slice(&data).unwrap();
     let ver = match version {
         MCVersionType::Release => {
             let mut i = 0;
-            while !mc_versions[i].major { 
+            while !mc_versions[i].major {
                 i += 1;
-            };
+            }
             &mc_versions[i]
-        },
+        }
         MCVersionType::Latest => &mc_versions[0],
         MCVersionType::Specific => {
             println!("Not inplemented");
diff --git a/src/commands/download.rs b/src/commands/download.rs
index 2714630..9434591 100644
--- a/src/commands/download.rs
+++ b/src/commands/download.rs
@@ -1,10 +1,16 @@
-use crate::{files::{get_downloaded_versions, download_versions, delete_version, disable_version, clean_list_dir}, db::{userlist_get_all_current_versions_with_mods, lists_get_all_ids, lists_get}, modrinth::get_raw_versions, error::{MLE, ErrorType, MLError}};
-use crate::{List, get_current_list, config::Cfg, input::Input};
-
-pub async fn download(config: Cfg, input: Input) -> MLE<()> {
+use crate::{config::Cfg, get_current_list, List};
+use crate::{
+    db::{lists_get, lists_get_all_ids, userlist_get_all_current_versions_with_mods},
+    error::{ErrorType, MLError, MLE},
+    files::{
+        clean_list_dir, delete_version, disable_version, download_versions, get_downloaded_versions,
+    },
+    modrinth::get_raw_versions,
+};
 
+pub async fn download(config: Cfg, all_lists: bool, clean: bool, delete_old: bool) -> MLE<()> {
     let mut liststack: Vec<List> = vec![];
-    if input.all_lists {
+    if all_lists {
         let list_ids = lists_get_all_ids(config.clone())?;
         for id in list_ids {
             liststack.push(lists_get(config.clone(), id)?);
@@ -18,7 +24,10 @@ pub async fn download(config: Cfg, input: Input) -> MLE<()> {
     for current_list in liststack {
         let downloaded_versions = get_downloaded_versions(current_list.clone())?;
         println!("To download: {:#?}", downloaded_versions);
-        let current_version_ids = match userlist_get_all_current_versions_with_mods(config.clone(), String::from(&current_list.id)) {
+        let current_version_ids = match userlist_get_all_current_versions_with_mods(
+            config.clone(),
+            String::from(&current_list.id),
+        ) {
             Ok(i) => Ok(i),
             Err(e) => Err(MLError::new(ErrorType::DBError, e.to_string().as_str())),
         }?;
@@ -33,31 +42,40 @@ pub async fn download(config: Cfg, input: Input) -> MLE<()> {
 
             let current_download = downloaded_versions.get(&mod_id);
 
-            if current_download.is_none() || input.clean {
+            if current_download.is_none() || clean {
                 to_download.push(current_version);
             } else {
-                let downloaded_version = current_download.ok_or("SOMETHING_HAS_REALLY_GONE_WRONG").unwrap();
+                let downloaded_version = current_download
+                    .ok_or("SOMETHING_HAS_REALLY_GONE_WRONG")
+                    .unwrap();
                 if &current_version != downloaded_version {
                     to_disable.push((mod_id.clone(), String::from(downloaded_version)));
                     to_download.push(current_version);
                 }
             }
         }
-        
-        if input.clean { clean_list_dir(&current_list)? };
+
+        if clean {
+            clean_list_dir(&current_list)?
+        };
 
         if !to_download.is_empty() {
-            download_versions(current_list.clone(), config.clone(), get_raw_versions(&config.apis.modrinth, to_download).await).await?;
+            download_versions(
+                current_list.clone(),
+                config.clone(),
+                get_raw_versions(&config.apis.modrinth, to_download).await,
+            )
+            .await?;
         } else {
             println!("There are no new versions to download");
         }
-        
+
         if !to_disable.is_empty() {
             for ver in to_disable {
-                if input.delete_old {
+                if delete_old {
                     println!("Deleting version {} for mod {}", ver.1, ver.0);
                     delete_version(current_list.clone(), ver.1)?;
-                } else { 
+                } else {
                     disable_version(config.clone(), current_list.clone(), ver.1, ver.0)?;
                 };
             }
diff --git a/src/commands/io.rs b/src/commands/io.rs
index a3d056f..7f03eec 100644
--- a/src/commands/io.rs
+++ b/src/commands/io.rs
@@ -1,12 +1,18 @@
+use serde::{Deserialize, Serialize};
 use std::fs::File;
 use std::io::prelude::*;
-use serde::{Serialize, Deserialize};
 
-use crate::{input::{Input, IoOptions}, db::{lists_get, userlist_get_all_ids, lists_get_all_ids, lists_insert}, config::Cfg, Modloader, List, devdir, error::MLE, mods_add, IDSelector};
+use crate::{
+    config::Cfg,
+    db::{lists_get, lists_get_all_ids, lists_insert, userlist_get_all_ids},
+    devdir,
+    error::MLE,
+    mod_add, IDSelector, List, Modloader,
+};
 
 #[derive(Debug, Serialize, Deserialize)]
 struct Export {
-    lists: Vec<ExportList>
+    lists: Vec<ExportList>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -20,73 +26,77 @@ struct ExportList {
 
 impl ExportList {
     pub fn from(config: Cfg, list_id: String, download: bool) -> MLE<Self> {
-
         let list = lists_get(config.clone(), String::from(&list_id))?;
 
         let mut dl_folder = None;
-        if download{ dl_folder = Some(list.download_folder) };
+        if download {
+            dl_folder = Some(list.download_folder)
+        };
 
         let mods = userlist_get_all_ids(config, list_id)?.join("|");
 
-        Ok(Self { id: list.id, mods, launcher: list.modloader.to_string(), mc_version: list.mc_version, download_folder: dl_folder })
+        Ok(Self {
+            id: list.id,
+            mods,
+            launcher: list.modloader.to_string(),
+            mc_version: list.mc_version,
+            download_folder: dl_folder,
+        })
     }
 }
 
-pub async fn io(config: Cfg, input: Input) -> MLE<()> {
-    
-    match input.clone().io_options.unwrap() {
-        IoOptions::Export => { export(config, input)? },
-        IoOptions::Import => { import(config, input).await? },
-    }
-
-    Ok(())
-}
-
-fn export(config: Cfg, input: Input) -> MLE<()> {
+pub fn export(config: Cfg, list: Option<String>) -> MLE<()> {
     let mut list_ids: Vec<String> = vec![];
-    if input.all_lists {
+    if list.is_none() {
         list_ids = lists_get_all_ids(config.clone())?;
     } else {
-        list_ids.push(lists_get(config.clone(), input.list.unwrap().id)?.id);
+        list_ids.push(lists_get(config.clone(), list.unwrap())?.id);
     }
     let mut lists: Vec<ExportList> = vec![];
     for list_id in list_ids {
         lists.push(ExportList::from(config.clone(), list_id, true)?);
     }
-    
-    let toml = toml::to_string( &Export { lists } )?;
+
+    let toml = toml::to_string(&Export { lists })?;
 
     let filestr = dirs::home_dir().unwrap().join("mlexport.toml");
 
-    let mut file = File::create(devdir(filestr.into_os_string().into_string().unwrap().as_str()))?;
+    let mut file = File::create(devdir(
+        filestr.into_os_string().into_string().unwrap().as_str(),
+    ))?;
     file.write_all(toml.as_bytes())?;
 
     Ok(())
 }
 
-async fn import(config: Cfg, input: Input) -> MLE<()> {
-    
-    let filestr: String = match input.file {
-        Some(args) => args,
-        None => devdir(dirs::home_dir().unwrap().join("mlexport.toml").into_os_string().into_string().unwrap().as_str()),
-    };
-
-    let mut file = File::open(filestr)?;
+pub async fn import(config: Cfg, file_str: String, direct_download: bool) -> MLE<()> {
+    let mut file = File::open(file_str)?;
     let mut content = String::new();
     file.read_to_string(&mut content)?;
     let export: Export = toml::from_str(&content)?;
 
     for exportlist in export.lists {
-        let list = List { id: exportlist.id, mc_version: exportlist.mc_version, modloader: Modloader::from(&exportlist.launcher)?, download_folder: exportlist.download_folder.ok_or("NO_DL").unwrap() };
-        lists_insert(config.clone(), list.id.clone(), list.mc_version.clone(), list.modloader.clone(), String::from(&list.download_folder))?;
+        let list = List {
+            id: exportlist.id,
+            mc_version: exportlist.mc_version,
+            modloader: Modloader::from(&exportlist.launcher)?,
+            download_folder: exportlist.download_folder.ok_or("NO_DL").unwrap(),
+        };
+        lists_insert(
+            config.clone(),
+            list.id.clone(),
+            list.mc_version.clone(),
+            list.modloader.clone(),
+            String::from(&list.download_folder),
+        )?;
         let mods: Vec<&str> = exportlist.mods.split('|').collect();
         let mut mod_ids = vec![];
         for mod_id in mods {
             mod_ids.push(IDSelector::ModificationID(String::from(mod_id)));
-        };
+        }
         //TODO impl set_version and good direct download
         //TODO impl all at once, dafuck
-        mods_add(config.clone(), mod_ids, list, input.direct_download, false).await?;
+        mod_add(config.clone(), mod_ids, list, direct_download, false).await?;
     }
     Ok(())
 }
diff --git a/src/commands/list.rs b/src/commands/list.rs
index 8e86973..13176f4 100644
--- a/src/commands/list.rs
+++ b/src/commands/list.rs
@@ -1,4 +1,12 @@
-use crate::{db::{lists_insert, lists_remove, config_change_current_list, config_get_current_list, lists_get, lists_version}, Modloader, config::Cfg, input::{Input, ListOptions}, cmd_update, error::MLE};
+use crate::{
+    config::Cfg,
+    db::{
+        config_change_current_list, config_get_current_list, lists_get, lists_insert, lists_remove,
+        lists_version,
+    },
+    error::MLE,
+    update, Modloader,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct List {
@@ -8,60 +16,55 @@ pub struct List {
     pub download_folder: String,
 }
 
-pub async fn list(config: Cfg, input: Input) -> MLE<()> {
-
-    match input.clone().list_options.unwrap() {
-        ListOptions::Add => {
-            add(config, input)
-        },
-        ListOptions::Change => {
-            change(config, input)
-        },
-        ListOptions::Remove => {
-            remove(config, input)
-        },
-        ListOptions::Version => {
-            version(config, input).await
-        }
-    }
-}
-
 pub fn get_current_list(config: Cfg) -> MLE<List> {
     let id = config_get_current_list(config.clone())?;
     lists_get(config, id)
 }
 
-fn add(config: Cfg, input: Input) -> MLE<()> {
-    let id = input.list_id.unwrap();
-    let mc_version = input.list_mcversion.unwrap();
-    let mod_loader = input.modloader.unwrap();
-    let download_folder = input.directory.unwrap();
-    lists_insert(config, id, mc_version, mod_loader, download_folder)
+pub fn list_add(
+    config: Cfg,
+    id: String,
+    mc_version: String,
+    modloader: Modloader,
+    directory: String,
+) -> MLE<()> {
+    lists_insert(config, id, mc_version, modloader, directory)
 }
 
-fn change(config: Cfg, input: Input) -> MLE<()> {
-    println!("Change default list to: {}", input.clone().list.unwrap().id);
-    config_change_current_list(config, input.list.unwrap().id)
+pub fn list_change(config: Cfg, id: String) -> MLE<()> {
+    //TODO check if list exists
+    println!("Change default list to: {}", id);
+    config_change_current_list(config, id)
 }
 
-fn remove(config: Cfg, input: Input) -> MLE<()> {
-    lists_remove(config, input.list.unwrap().id)
+pub fn list_remove(config: Cfg, id: String) -> MLE<()> {
+    lists_remove(config, id)
 }
 
 ///Changing the current lists version and updating it
 ///
 /// #Arguments
-/// 
+///
 /// * `config` - The current config
 /// * `args` - All args, to extract the new version
-async fn version(config: Cfg, input: Input) -> MLE<()> {
-    println!("Change version for list {} to minecraft version: {}", input.clone().list.unwrap().id, input.clone().list_mcversion.unwrap());
+pub async fn list_version(
+    config: Cfg,
+    id: String,
+    mc_version: String,
+    download: bool,
+    delete: bool,
+) -> MLE<()> {
+    println!(
+        "Change version for list {} to minecraft version: {}",
+        id, mc_version
+    );
 
-    lists_version(config.clone(), input.clone().list.ok_or("").unwrap().id, input.clone().list_mcversion.ok_or("").unwrap())?;
-    
-    //Linebreak readability
-    println!("");
+    lists_version(config.clone(), &id, &mc_version)?;
 
-    println!("Check for updates for new minecraft version in list {}", input.clone().list.unwrap().id);
-    cmd_update(config, vec![input.list.ok_or("").unwrap()], true, input.direct_download, input.delete_old).await
+    println!(
+        "\nCheck for updates for new minecraft version in list {}",
+        id
+    );
+    let list = lists_get(config.clone(), id)?;
+    update(config, vec![list], true, download, delete).await
 }
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index 0d5bd00..1c7c012 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -1,13 +1,13 @@
-pub mod modification;
-pub mod list;
-pub mod update;
-pub mod setup;
 pub mod download;
 pub mod io;
+pub mod list;
+pub mod modification;
+pub mod setup;
+pub mod update;
 
-pub use modification::*;
-pub use list::*;
-pub use update::*;
-pub use setup::*;
 pub use download::*;
 pub use io::*;
+pub use list::*;
+pub use modification::*;
+pub use setup::*;
+pub use update::*;
diff --git a/src/commands/modification.rs b/src/commands/modification.rs
index 31e50af..ffc4e10 100644
--- a/src/commands/modification.rs
+++ b/src/commands/modification.rs
@@ -1,27 +1,19 @@
-use crate::{modrinth::{versions, extract_current_version, Version, projects, get_raw_versions, project}, config::Cfg, db::{mods_insert, userlist_remove, mods_get_id, userlist_insert, userlist_get_all_ids, userlist_get_current_version, lists_get_all_ids, mods_remove}, input::{Input, ModOptions}, files::{delete_version, download_versions}, List, error::{MLE, ErrorType, MLError}};
+use crate::{
+    config::Cfg,
+    db::{
+        lists_get_all_ids, mods_get_id, mods_insert, mods_remove, userlist_get_all_ids,
+        userlist_get_current_version, userlist_insert, userlist_remove,
+    },
+    error::{ErrorType, MLError, MLE},
+    files::{delete_version, download_versions},
+    modrinth::{extract_current_version, get_raw_versions, project, projects, versions, Version},
+    List,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum IDSelector {
     ModificationID(String),
-    VersionID(String)
-}
-
-pub async fn modification(config: Cfg, input: Input) -> MLE<()> {
-    match input.clone().mod_options.ok_or("").unwrap() {
-        ModOptions::Add => {
-            add(config, input).await
-        },
-        ModOptions::Remove => {
-            remove(config, input)
-        },
-    }
-}
-
-async fn add(config: Cfg, input: Input) -> MLE<()> {
-
-    mods_add(config, vec![input.mod_id.unwrap()], input.list.unwrap(), input.direct_download, input.set_version).await?;
-
-    Ok(())
+    VersionID(String),
 }
 
 #[derive(Debug, Clone)]
@@ -34,10 +26,16 @@ pub struct ProjectInfo {
     pub download_link: String,
 }
 
-pub async fn mods_add(config: Cfg, ids: Vec<IDSelector>, list: List, direct_download: bool, set_version: bool) -> MLE<()> {
+pub async fn mod_add(
+    config: Cfg,
+    ids: Vec<IDSelector>,
+    list: List,
+    direct_download: bool,
+    set_version: bool,
+) -> MLE<()> {
     println!("Add mods to {}", list.id);
     println!("  └Add mods:");
-    
+
     let mut mod_ids: Vec<String> = Vec::new();
     let mut ver_ids: Vec<String> = Vec::new();
 
@@ -50,11 +48,17 @@ pub async fn mods_add(config: Cfg, ids: Vec<IDSelector>, list: List, direct_down
     }
 
     let mut projectinfo: Vec<ProjectInfo> = Vec::new();
-    if !mod_ids.is_empty() { projectinfo.append(&mut get_mod_infos(config.clone(), mod_ids, list.clone()).await?) };
-    if !ver_ids.is_empty() { projectinfo.append(&mut get_ver_info(config.clone(), ver_ids).await?) };
+    if !mod_ids.is_empty() {
+        projectinfo.append(&mut get_mod_infos(config.clone(), mod_ids, list.clone()).await?)
+    };
+    if !ver_ids.is_empty() {
+        projectinfo.append(&mut get_ver_info(config.clone(), ver_ids).await?)
+    };
+
+    if projectinfo.is_empty() {
+        return Err(MLError::new(ErrorType::ArgumentError, "NO_IDS?"));
+    };
 
-    if projectinfo.is_empty() { return Err(MLError::new(ErrorType::ArgumentError, "NO_IDS?")) };
-    
     let mut downloadstack: Vec<Version> = Vec::new();
 
     //Adding each mod to the lists and downloadstack
@@ -63,29 +67,59 @@ pub async fn mods_add(config: Cfg, ids: Vec<IDSelector>, list: List, direct_down
     } else {
         println!("  └Insert mods in list {} and save infos", list.id);
     }
-    
+
     for project in projectinfo {
-        let current_version_id = if project.current_version.is_none() { String::from("NONE") } else { project.current_version.clone().unwrap().id };
-        match userlist_insert(config.clone(), &list.id, &project.mod_id, &current_version_id, project.clone().applicable_versions, &project.download_link, set_version) {
+        let current_version_id = if project.current_version.is_none() {
+            String::from("NONE")
+        } else {
+            project.current_version.clone().unwrap().id
+        };
+        match userlist_insert(
+            config.clone(),
+            &list.id,
+            &project.mod_id,
+            &current_version_id,
+            project.clone().applicable_versions,
+            &project.download_link,
+            set_version,
+        ) {
             Err(e) => {
                 let expected_err = format!("SQL: UNIQUE constraint failed: {}.mod_id", list.id);
-                if e.to_string() == expected_err { Err(MLError::new(ErrorType::ModError, "MOD_ALREADY_ON_SELECTED_LIST")) } else { Err(e) }
-            },
-            Ok(..) => { Ok(..) },
+                if e.to_string() == expected_err {
+                    Err(MLError::new(
+                        ErrorType::ModError,
+                        "MOD_ALREADY_ON_SELECTED_LIST",
+                    ))
+                } else {
+                    Err(e)
+                }
+            }
+            Ok(..) => Ok(..),
         }?;
-        
-        match mods_insert(config.clone(), &project.mod_id, &project.slug, &project.title) {
+
+        match mods_insert(
+            config.clone(),
+            &project.mod_id,
+            &project.slug,
+            &project.title,
+        ) {
             Err(e) => {
-                if e.to_string() == "SQL: UNIQUE constraint failed: mods.id" { Ok(..) } else { Err(e) }
-            },
+                if e.to_string() == "SQL: UNIQUE constraint failed: mods.id" {
+                    Ok(..)
+                } else {
+                    Err(e)
+                }
+            }
             Ok(..) => Ok(..),
         }?;
 
-        if project.current_version.is_some() { downloadstack.push(project.current_version.unwrap()) };
+        if project.current_version.is_some() {
+            downloadstack.push(project.current_version.unwrap())
+        };
     }
 
     //Download all the added mods
-    if direct_download { 
+    if direct_download {
         download_versions(list.clone(), config.clone(), downloadstack).await?;
     };
 
@@ -104,7 +138,12 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec
     for project in m_projects {
         println!("\t└{}", project.title);
         println!("\t  └Get versions");
-        let available_versions = versions(&config.apis.modrinth, String::from(&project.id), list.clone()).await;
+        let available_versions = versions(
+            &config.apis.modrinth,
+            String::from(&project.id),
+            list.clone(),
+        )
+        .await;
 
         let mut available_versions_vec: Vec<String> = Vec::new();
         let current_version: Option<Version>;
@@ -113,36 +152,63 @@ async fn get_mod_infos(config: Cfg, mod_ids: Vec<String>, list: List) -> MLE<Vec
             let current_id = extract_current_version(available_versions.clone())?;
             println!("\t  └Current version: {}", current_id);
 
-            current_version = Some(available_versions.clone().into_iter().find(|v| v.id == current_id).unwrap());
+            current_version = Some(
+                available_versions
+                    .clone()
+                    .into_iter()
+                    .find(|v| v.id == current_id)
+                    .unwrap(),
+            );
 
-            file = current_version.clone().ok_or("").unwrap().files.into_iter().find(|f| f.primary).unwrap().url;
+            file = current_version
+                .clone()
+                .ok_or("")
+                .unwrap()
+                .files
+                .into_iter()
+                .find(|f| f.primary)
+                .unwrap()
+                .url;
             for ver in available_versions {
                 available_versions_vec.push(ver.id);
-            };
-
-            projectinfo.push(ProjectInfo { mod_id: project.id, slug: project.slug, title: project.title, current_version, applicable_versions: available_versions_vec, download_link: file })
+            }
 
+            projectinfo.push(ProjectInfo {
+                mod_id: project.id,
+                slug: project.slug,
+                title: project.title,
+                current_version,
+                applicable_versions: available_versions_vec,
+                download_link: file,
+            })
         } else {
             println!("\t  └There's currently no mod version for your specified target");
             current_version = None;
             file = String::from("NONE");
             available_versions_vec.push(String::from("NONE"));
-            projectinfo.push(ProjectInfo { mod_id: project.id, slug: project.slug, title: project.title, current_version, applicable_versions: available_versions_vec, download_link: file })
+            projectinfo.push(ProjectInfo {
+                mod_id: project.id,
+                slug: project.slug,
+                title: project.title,
+                current_version,
+                applicable_versions: available_versions_vec,
+                download_link: file,
+            })
         }
-    };
+    }
 
     Ok(projectinfo)
 }
 
 async fn get_ver_info(config: Cfg, ver_ids: Vec<String>) -> MLE<Vec<ProjectInfo>> {
     let mut projectinfo: Vec<ProjectInfo> = Vec::new();
-    
+
     //Get required information from ver_ids
     let mut v_versions = get_raw_versions(&config.apis.modrinth, ver_ids).await;
     let mut v_mod_ids: Vec<String> = Vec::new();
     for ver in v_versions.clone() {
         v_mod_ids.push(ver.project_id);
-    };
+    }
     let mut v_projects = projects(&config.apis.modrinth, v_mod_ids).await;
     v_versions.sort_by(|a, b| a.project_id.cmp(&b.project_id));
     v_projects.sort_by(|a, b| a.id.cmp(&b.id));
@@ -150,35 +216,54 @@ async fn get_ver_info(config: Cfg, ver_ids: Vec<String>) -> MLE<Vec<ProjectInfo>
     for (i, project) in v_projects.into_iter().enumerate() {
         let version = &v_versions[i];
         println!("\t└{}({})", project.title, version.id);
-        let file = version.clone().files.into_iter().find(|f| f.primary).unwrap().url;
-        projectinfo.push(ProjectInfo { mod_id: project.id, slug: project.slug, title: project.title, current_version: Some(version.clone()), applicable_versions: vec![String::from(&version.id)], download_link: file })
-    };
+        let file = version
+            .clone()
+            .files
+            .into_iter()
+            .find(|f| f.primary)
+            .unwrap()
+            .url;
+        projectinfo.push(ProjectInfo {
+            mod_id: project.id,
+            slug: project.slug,
+            title: project.title,
+            current_version: Some(version.clone()),
+            applicable_versions: vec![String::from(&version.id)],
+            download_link: file,
+        })
+    }
     Ok(projectinfo)
 }
 
-fn remove(config: Cfg, input: Input) -> MLE<()> {
-    
-    let id = match input.clone().mod_id.unwrap() {
-        IDSelector::ModificationID(id) => id,
-        IDSelector::VersionID(..) => return Err(MLError::new(ErrorType::ArgumentError, "NO_MOD_ID")),
-    }; 
-    
-    let mod_id = mods_get_id(&config.data, &id)?;
-    
-    let version = userlist_get_current_version(config.clone(), input.clone().list.unwrap().id, String::from(&mod_id))?;
-
-    userlist_remove(config.clone(), input.clone().list.unwrap().id, String::from(&mod_id))?;
-    delete_version(input.list.unwrap(), version)?;
-    
+/// Remove mod from a list
+/// # Arguments
+///
+/// * `config` - config struct
+/// * `id` - name, slug or id of the mod
+/// * `list` - List struct
+pub fn mod_remove(config: Cfg, id: &str, list: List) -> MLE<()> {
+    let mod_id = mods_get_id(&config.data, id)?;
+
+    let version = userlist_get_current_version(config.clone(), &list.id, &mod_id)?;
+
+    userlist_remove(config.clone(), &list.id, &mod_id)?;
+    delete_version(list, version)?;
+
     let list_ids = lists_get_all_ids(config.clone())?;
-    
+
+    // Remove mod from main list if not used elsewhere
     let mut mod_used = false;
     for id in list_ids {
         let mods = userlist_get_all_ids(config.clone(), id)?;
-        if mods.contains(&mod_id) { mod_used = true; break; };
-    };
+        if mods.contains(&mod_id) {
+            mod_used = true;
+            break;
+        };
+    }
 
-    if !mod_used { mods_remove(config, mod_id)?; };
+    if !mod_used {
+        mods_remove(config, mod_id)?;
+    };
 
     Ok(())
 }
diff --git a/src/commands/setup.rs b/src/commands/setup.rs
index 0161bd7..40e8c0a 100644
--- a/src/commands/setup.rs
+++ b/src/commands/setup.rs
@@ -1,14 +1,14 @@
 use std::{fs::File, path::Path};
 
-use crate::{config::Cfg, db::db_setup, error::MLE, devdir};
+use crate::{config::Cfg, db::db_setup, devdir, error::MLE};
 
 pub async fn setup(config: Cfg) -> MLE<()> {
     let db_file = devdir(format!("{}/data.db", config.data).as_str());
-    
+
     if !Path::new(&db_file).exists() {
         create(config, db_file)?;
     }
-    
+
     /*
     match s_config_get_version(config.clone()) {
         Ok(ver) => {
@@ -21,12 +21,11 @@ pub async fn setup(config: Cfg) -> MLE<()> {
         Err(..) => to_02(config).await?
     };
     */
-    
+
     Ok(())
 }
 
 fn create(config: Cfg, db_file: String) -> MLE<()> {
-
     println!("Create database");
 
     File::create(db_file)?;
@@ -44,7 +43,7 @@ fn create(config: Cfg, db_file: String) -> MLE<()> {
 //        let full_list = lists_get(config.clone(), String::from(&list))?;
 //
 //        let versions = userlist_get_all_current_version_ids(config.clone(), full_list.clone().id)?;
-//        
+//
 //        let raw_versions = get_raw_versions(String::from(&config.apis.modrinth), versions).await;
 //
 //        for ver in raw_versions {
@@ -69,4 +68,3 @@ fn create(config: Cfg, db_file: String) -> MLE<()> {
 //    }
 //    s_config_update_version(config, String::from("0.4"))
 //}
-
diff --git a/src/commands/update.rs b/src/commands/update.rs
index 75bee39..3d9578b 100644
--- a/src/commands/update.rs
+++ b/src/commands/update.rs
@@ -1,29 +1,30 @@
-use crate::{config::Cfg, modrinth::{versions, extract_current_version, Version}, get_current_list, db::{userlist_get_all_ids, userlist_get_applicable_versions, userlist_change_versions, lists_get_all_ids, lists_get, userlist_get_current_version, userlist_get_set_version, mods_get_info}, List, input::Input, files::{delete_version, download_versions, disable_version, clean_list_dir}, error::{MLE, MLError, ErrorType}};
-
-pub async fn update(config: Cfg, input: Input) -> MLE<()> {
-    let mut liststack: Vec<List> = vec![];
-    if input.all_lists {
-        let list_ids = lists_get_all_ids(config.clone())?;
-        for id in list_ids {
-            liststack.push(lists_get(config.clone(), id)?);
-        }
-    } else {
-        let current = get_current_list(config.clone())?;
-        println!("Update list {}:", current.id);
-        liststack.push(current)
-    }
-    cmd_update(config, liststack, input.clean, input.direct_download, input.delete_old).await
-}
-
-pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_download: bool, delete_old: bool) -> MLE<()> {
+use crate::{
+    config::Cfg,
+    db::{
+        mods_get_info, userlist_change_versions, userlist_get_all_ids,
+        userlist_get_applicable_versions, userlist_get_current_version, userlist_get_set_version,
+    },
+    error::{ErrorType, MLError, MLE},
+    files::{clean_list_dir, delete_version, disable_version, download_versions},
+    modrinth::{extract_current_version, versions, Version},
+    List,
+};
+
+pub async fn update(
+    config: Cfg,
+    liststack: Vec<List>,
+    clean: bool,
+    direct_download: bool,
+    delete_old: bool,
+) -> MLE<()> {
     for current_list in liststack {
         let mods = userlist_get_all_ids(config.clone(), current_list.clone().id)?;
-        
+
         let mut current_versions: Vec<(String, String)> = vec![];
-        
+
         println!("  └Update mods:");
         let mut updatestack: Vec<Version> = vec![];
-        
+
         for id in mods {
             let info = mods_get_info(config.clone(), &id)?;
             println!("\t└{}", info.title);
@@ -34,27 +35,39 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
             }
 
             //Getting current installed version for disable or delete
-            let disable_version = userlist_get_current_version(config.clone(), String::from(&current_list.id), String::from(&id))?;
+            let disable_version =
+                userlist_get_current_version(config.clone(), &current_list.id, &id)?;
 
             updatestack.push(
-                match specific_update(config.clone(), clean, current_list.clone(), String::from(&id)).await {
+                match specific_update(
+                    config.clone(),
+                    clean,
+                    current_list.clone(),
+                    String::from(&id),
+                )
+                .await
+                {
                     Ok(ver) => {
                         current_versions.push((disable_version, id));
                         ver
-                    },
+                    }
                     Err(e) => {
                         if e.to_string() == "Mod: NO_UPDATE_AVAILABLE" {
-                            println!("\t  └No new version found for the specified minecraft version");
+                            println!(
+                                "\t  └No new version found for the specified minecraft version"
+                            );
                         } else {
                             return Err(e);
                         };
                         continue;
                     }
-                }
+                },
             )
-        };
+        }
 
-        if clean { clean_list_dir(&current_list)?; };
+        if clean {
+            clean_list_dir(&current_list)?;
+        };
 
         if direct_download && !updatestack.is_empty() {
             download_versions(current_list.clone(), config.clone(), updatestack).await?;
@@ -65,7 +78,7 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
                     if delete_old {
                         println!("\t  └Delete version {}", ver.0);
                         delete_version(current_list.clone(), ver.0)?;
-                    } else if ver.0 != "NONE" { 
+                    } else if ver.0 != "NONE" {
                         println!("\t  └Disable version {}", ver.0);
                         disable_version(config.clone(), current_list.clone(), ver.0, ver.1)?;
                     };
@@ -78,10 +91,11 @@ pub async fn cmd_update(config: Cfg, liststack: Vec<List>, clean: bool, direct_d
 }
 
 async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> MLE<Version> {
-    let applicable_versions = versions(&config.apis.modrinth, String::from(&id), list.clone()).await;
-    
+    let applicable_versions =
+        versions(&config.apis.modrinth, String::from(&id), list.clone()).await;
+
     let mut versions: Vec<String> = vec![];
-    
+
     if !applicable_versions.is_empty() {
         for ver in &applicable_versions {
             versions.push(String::from(&ver.id));
@@ -92,8 +106,14 @@ async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> ML
 
     let mut current: Vec<Version> = vec![];
     //TODO Split clean and no match
-    if clean || (versions.join("|") != userlist_get_applicable_versions(config.clone(), String::from(&list.id), String::from(&id))?) {
-
+    if clean
+        || (versions.join("|")
+            != userlist_get_applicable_versions(
+                config.clone(),
+                String::from(&list.id),
+                String::from(&id),
+            )?)
+    {
         let current_str = extract_current_version(applicable_versions.clone())?;
 
         if clean {
@@ -104,34 +124,54 @@ async fn specific_update(config: Cfg, clean: bool, list: List, id: String) -> ML
         };
 
         //get new versions
-        let current_ver = match applicable_versions.into_iter().find(|ver| ver.id == current_str).ok_or("!no current version in applicable_versions") {
+        let current_ver = match applicable_versions
+            .into_iter()
+            .find(|ver| ver.id == current_str)
+            .ok_or("!no current version in applicable_versions")
+        {
             Ok(v) => Ok(v),
             Err(e) => Err(MLError::new(ErrorType::Other, e)),
         }?;
         current.push(current_ver.clone());
 
-        let link = match current_ver.files.into_iter().find(|f| f.primary).ok_or("!no primary in links") {
+        //TODO implement version selection if no primary
+        let link = match current_ver
+            .files
+            .into_iter()
+            .find(|f| f.primary)
+            .ok_or("!no primary in links")
+        {
             Ok(p) => Ok(p),
             Err(e) => Err(MLError::new(ErrorType::Other, e)),
-        }?.url;
+        }?
+        .url;
         userlist_change_versions(config, list.id, current_str, versions.join("|"), link, id)?;
     }
 
-    if current.is_empty() { return Err(MLError::new(ErrorType::ModError, "NO_UPDATE_AVAILABLE")) };
-    
+    if current.is_empty() {
+        return Err(MLError::new(ErrorType::ModError, "NO_UPDATE_AVAILABLE"));
+    };
+
     //println!(" └✔️");
     Ok(current[0].clone())
 }
 
 #[tokio::test]
 async fn download_updates_test() {
+    use crate::{
+        modrinth::{Hash, Version, VersionFile, VersionType},
+        List, Modloader,
+    };
 
-    use crate::{modrinth::{Version, VersionFile, Hash, VersionType}, Modloader, List};
-    
     let config = Cfg::init("modlist.toml").unwrap();
-    let current_list = List { id: String::from("..."), mc_version: String::from("..."), modloader: Modloader::Fabric, download_folder: String::from("./dev/tests/dl") }; 
-
-    let versions = vec![Version { 
+    let current_list = List {
+        id: String::from("..."),
+        mc_version: String::from("..."),
+        modloader: Modloader::Fabric,
+        download_folder: String::from("./dev/tests/dl"),
+    };
+
+    let versions = vec![Version {
             id: "dEqtGnT9".to_string(),
             project_id: "kYuIpRLv".to_string(),
             author_id: "Qnt13hO8".to_string(),
@@ -161,5 +201,7 @@ async fn download_updates_test() {
                 "fabric".to_string()
             ]
         }];
-    assert!(download_versions(current_list, config, versions).await.is_ok())
+    assert!(download_versions(current_list, config, versions)
+        .await
+        .is_ok())
 }
diff --git a/src/config.rs b/src/config.rs
index ded0062..1b54d5f 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,8 +1,11 @@
-use std::{fs::File, io::{Read, Write}};
+use std::{
+    fs::File,
+    io::{Read, Write},
+};
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-use crate::{error::MLE, devdir};
+use crate::{devdir, error::MLE};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Cfg {
@@ -24,10 +27,15 @@ impl Cfg {
             Err(err) => {
                 if err.kind() == std::io::ErrorKind::NotFound {
                     println!("No config file found, creating one");
-                    let default_cfg = Cfg { data: String::from("./"), apis: Apis { modrinth: String::from("https://api.modrinth.com/v2/") } };
+                    let default_cfg = Cfg {
+                        data: String::from("./"),
+                        apis: Apis {
+                            modrinth: String::from("https://api.modrinth.com/v2/"),
+                        },
+                    };
                     let mut file = File::create(devdir(configfile.to_str().unwrap()))?;
                     println!("Created config file");
-                    file.write_all(&toml::to_string(&default_cfg)?.as_bytes())?;
+                    file.write_all(toml::to_string(&default_cfg)?.as_bytes())?;
                     File::open(devdir(configfile.to_str().unwrap()))?
                 } else {
                     return Err(err.into());
diff --git a/src/db.rs b/src/db.rs
index 9428466..09d54c2 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -2,17 +2,21 @@ use std::io::{Error, ErrorKind};
 
 use rusqlite::Connection;
 
-use crate::{Modloader, config::Cfg, List, devdir, error::{MLE, MLError, ErrorType}};
+use crate::{
+    config::Cfg,
+    devdir,
+    error::{ErrorType, MLError, MLE},
+    List, Modloader,
+};
 
 //MODS
 pub fn mods_insert(config: Cfg, id: &str, slug: &str, name: &str) -> MLE<()> {
-
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
     connection.execute(
         "INSERT INTO mods (id, slug, title) VALUES (?1, ?2, ?3)",
-        [id, slug, name.replace('\'', "").as_str()]
+        [id, slug, name.replace('\'', "").as_str()],
     )?;
 
     Ok(())
@@ -21,13 +25,11 @@ pub fn mods_insert(config: Cfg, id: &str, slug: &str, name: &str) -> MLE<()> {
 pub fn mods_get_all_ids(config: Cfg) -> Result<Vec<String>, Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
-    
+
     let mut mods: Vec<String> = Vec::new();
 
     let mut stmt = connection.prepare("SELECT id FROM mods")?;
-    let id_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let id_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for id in id_iter {
         mods.push(id?);
@@ -49,33 +51,33 @@ pub fn mods_get_all_ids(config: Cfg) -> Result<Vec<String>, Box<dyn std::error::
 ///
 ///Will return `MLError` when no mod id is found
 pub fn mods_get_id(data: &str, slug: &str) -> MLE<String> {
+    //TODO check if "slug" is id
+
     let data = devdir(format!("{}/data.db", data).as_str());
     let connection = Connection::open(data)?;
-    
+
     let mut mod_id = String::new();
 
     //get from slug
     let mut stmt = connection.prepare("SELECT id FROM mods WHERE slug = ?")?;
-    let id_iter = stmt.query_map([slug], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let id_iter = stmt.query_map([slug], |row| row.get::<usize, String>(0))?;
 
     for id in id_iter {
         mod_id = id?;
-    };
+    }
     //get from title if no id found from slug
     if mod_id.is_empty() {
         let mut stmt = connection.prepare("SELECT id FROM mods WHERE title = ?")?;
-        let id_iter = stmt.query_map([slug], |row| {
-            row.get::<usize, String>(0)
-        })?;
+        let id_iter = stmt.query_map([slug], |row| row.get::<usize, String>(0))?;
 
         for id in id_iter {
             mod_id = id?;
-        };
+        }
     }
 
-    if mod_id.is_empty() { return Err(MLError::new(ErrorType::DBError, "GI_MOD_NOT_FOUND")) };
+    if mod_id.is_empty() {
+        return Err(MLError::new(ErrorType::DBError, "GI_MOD_NOT_FOUND"));
+    };
 
     Ok(mod_id)
 }
@@ -88,17 +90,23 @@ pub struct ModInfo {
 pub fn mods_get_info(config: Cfg, id: &str) -> MLE<ModInfo> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
-    
+
     let mut mod_info: Option<ModInfo> = None;
     let mut stmt = connection.prepare("SELECT title, slug FROM mods WHERE id = ?")?;
     let name_iter = stmt.query_map([id], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?])
+        Ok(vec![
+            row.get::<usize, String>(0)?,
+            row.get::<usize, String>(1)?,
+        ])
     })?;
 
     for info in name_iter {
         let i = info?;
-        mod_info = Some(ModInfo { title: String::from(&i[0]), slug: String::from(&i[1]) });
-    };
+        mod_info = Some(ModInfo {
+            title: String::from(&i[0]),
+            slug: String::from(&i[1]),
+        });
+    }
 
     match mod_info.is_none() {
         true => Err(MLError::new(ErrorType::DBError, "GN_MOD_NOT_FOUND")),
@@ -107,7 +115,6 @@ pub fn mods_get_info(config: Cfg, id: &str) -> MLE<ModInfo> {
 }
 
 pub fn mods_remove(config: Cfg, id: String) -> MLE<()> {
-
     println!("Removing mod {} from database", id);
 
     let data = devdir(format!("{}/data.db", config.data).as_str());
@@ -128,27 +135,42 @@ pub fn mods_get_versions(config: Cfg, mods: Vec<String>) -> MLE<Vec<DBModlistVer
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    if mods.is_empty() { return Err(MLError::new(ErrorType::ArgumentError, "MODS_NO_INPUT")); }
+    if mods.is_empty() {
+        return Err(MLError::new(ErrorType::ArgumentError, "MODS_NO_INPUT"));
+    }
 
     let mut wherestr = String::from("WHERE");
     for (i, id) in mods.iter().enumerate() {
         let mut or = " OR";
-        if i == mods.len() - 1 { or = "" };
+        if i == mods.len() - 1 {
+            or = ""
+        };
         wherestr = format!("{} id = '{}'{}", wherestr, id, or);
     }
 
     let mut versionmaps: Vec<DBModlistVersions> = Vec::new();
-    let mut stmt = connection.prepare(format!("SELECT id, versions, title FROM mods {}", wherestr).as_str())?;
+    let mut stmt = connection
+        .prepare(format!("SELECT id, versions, title FROM mods {}", wherestr).as_str())?;
     let id_iter = stmt.query_map([], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?, row.get::<usize, String>(2)?])
+        Ok(vec![
+            row.get::<usize, String>(0)?,
+            row.get::<usize, String>(1)?,
+            row.get::<usize, String>(2)?,
+        ])
     })?;
 
     for ver in id_iter {
         let version = ver?;
-        println!("\t({}) Get versions from the database", String::from(&version[2]));
+        println!(
+            "\t({}) Get versions from the database",
+            String::from(&version[2])
+        );
         //println!("Found versions {} for mod {}", version[1], version[0]);
-        versionmaps.push(DBModlistVersions { mod_id: String::from(&version[0]), versions: String::from(&version[1]) })
-    };
+        versionmaps.push(DBModlistVersions {
+            mod_id: String::from(&version[0]),
+            versions: String::from(&version[1]),
+        })
+    }
 
     match versionmaps.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "MODS_MODS_NOT_FOUND")),
@@ -157,16 +179,37 @@ pub fn mods_get_versions(config: Cfg, mods: Vec<String>) -> MLE<Vec<DBModlistVer
 }
 
 //userlist
-pub fn userlist_insert(config: Cfg, list_id: &str, mod_id: &str, current_version: &str, applicable_versions: Vec<String>, current_link: &str, set_version: bool) -> MLE<()> {
+pub fn userlist_insert(
+    config: Cfg,
+    list_id: &str,
+    mod_id: &str,
+    current_version: &str,
+    applicable_versions: Vec<String>,
+    current_link: &str,
+    set_version: bool,
+) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
-    
+
     let sv = match set_version {
         true => "1",
         false => "0",
     };
-    
-    connection.execute(format!("INSERT INTO {} VALUES (?1, ?2, ?3, ?4, 'NONE', ?5)", list_id).as_str(), [mod_id, current_version, applicable_versions.join("|").as_str(), current_link, sv])?;
+
+    connection.execute(
+        format!(
+            "INSERT INTO {} VALUES (?1, ?2, ?3, ?4, 'NONE', ?5)",
+            list_id
+        )
+        .as_str(),
+        [
+            mod_id,
+            current_version,
+            applicable_versions.join("|").as_str(),
+            current_link,
+            sv,
+        ],
+    )?;
 
     Ok(())
 }
@@ -177,14 +220,12 @@ pub fn userlist_get_all_ids(config: Cfg, list_id: String) -> MLE<Vec<String>> {
 
     let mut mod_ids: Vec<String> = Vec::new();
     let mut stmt = connection.prepare(format!("SELECT mod_id FROM {}", list_id).as_str())?;
-    let id_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let id_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for id in id_iter {
         //println!("Found id {:?}", id.as_ref().unwrap());
         mod_ids.push(id?)
-    };
+    }
 
     match mod_ids.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "NO_MODS")),
@@ -192,29 +233,38 @@ pub fn userlist_get_all_ids(config: Cfg, list_id: String) -> MLE<Vec<String>> {
     }
 }
 
-
-pub fn userlist_remove(config: Cfg, list_id: String, mod_id: String) -> MLE<()> {
+pub fn userlist_remove(config: Cfg, list_id: &str, mod_id: &str) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute(format!("DELETE FROM {} WHERE mod_id = ?", list_id).as_str(), [mod_id])?;
+    connection.execute(
+        format!("DELETE FROM {} WHERE mod_id = ?", list_id).as_str(),
+        [mod_id],
+    )?;
     Ok(())
 }
 
-
-pub fn userlist_get_applicable_versions(config: Cfg, list_id: String, mod_id: String) -> MLE<String> {
+pub fn userlist_get_applicable_versions(
+    config: Cfg,
+    list_id: String,
+    mod_id: String,
+) -> MLE<String> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
-    let mut stmt = connection.prepare(format!("SELECT applicable_versions FROM {} WHERE mod_id = ?", list_id).as_str())?;
-    let ver_iter = stmt.query_map([mod_id], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let mut stmt = connection.prepare(
+        format!(
+            "SELECT applicable_versions FROM {} WHERE mod_id = ?",
+            list_id
+        )
+        .as_str(),
+    )?;
+    let ver_iter = stmt.query_map([mod_id], |row| row.get::<usize, String>(0))?;
 
     for ver in ver_iter {
         version = ver?;
-    };
+    }
 
     match version.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "GAV_MOD_NOT_FOUND")),
@@ -222,39 +272,47 @@ pub fn userlist_get_applicable_versions(config: Cfg, list_id: String, mod_id: St
     }
 }
 
-pub fn userlist_get_all_applicable_versions_with_mods(config: Cfg, list_id: String) -> MLE<Vec<(String, String)>> {
+pub fn userlist_get_all_applicable_versions_with_mods(
+    config: Cfg,
+    list_id: String,
+) -> MLE<Vec<(String, String)>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<(String, String)> = Vec::new();
-    let mut stmt = connection.prepare(format!("SELECT mod_id, applicable_versions FROM {}", list_id).as_str())?;
+    let mut stmt = connection
+        .prepare(format!("SELECT mod_id, applicable_versions FROM {}", list_id).as_str())?;
     let id_iter = stmt.query_map([], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?])
+        Ok(vec![
+            row.get::<usize, String>(0)?,
+            row.get::<usize, String>(1)?,
+        ])
     })?;
 
     for ver in id_iter {
         let out = ver?;
         versions.push((out[0].to_owned(), out[1].to_owned()));
-    };
+    }
 
-    if versions.is_empty() { return Err(MLError::new(ErrorType::DBError, "NO_MODS_ON_LIST")); };
+    if versions.is_empty() {
+        return Err(MLError::new(ErrorType::DBError, "NO_MODS_ON_LIST"));
+    };
 
     Ok(versions)
 }
 
-pub fn userlist_get_current_version(config: Cfg, list_id: String, mod_id: String) -> MLE<String> {
+pub fn userlist_get_current_version(config: Cfg, list_id: &str, mod_id: &str) -> MLE<String> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
-    let mut stmt = connection.prepare(format!("SELECT current_version FROM {} WHERE mod_id = ?", list_id).as_str())?;
-    let ver_iter = stmt.query_map([&mod_id], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let mut stmt = connection
+        .prepare(format!("SELECT current_version FROM {} WHERE mod_id = ?", list_id).as_str())?;
+    let ver_iter = stmt.query_map([&mod_id], |row| row.get::<usize, String>(0))?;
 
     for ver in ver_iter {
         version = ver?;
-    };
+    }
 
     match version.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "GCV_MOD_NOT_FOUND")),
@@ -262,63 +320,88 @@ pub fn userlist_get_current_version(config: Cfg, list_id: String, mod_id: String
     }
 }
 
-pub fn userlist_get_all_current_version_ids(config: Cfg, list_id: String) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+pub fn userlist_get_all_current_version_ids(
+    config: Cfg,
+    list_id: String,
+) -> Result<Vec<String>, Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<String> = Vec::new();
-    let mut stmt = connection.prepare(format!("SELECT current_version FROM {}", list_id).as_str())?;
-    let id_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let mut stmt =
+        connection.prepare(format!("SELECT current_version FROM {}", list_id).as_str())?;
+    let id_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for id in id_iter {
         versions.push(id?);
-    };
+    }
 
-    if versions.is_empty() { return Err(Box::new(std::io::Error::new(ErrorKind::Other, "NO_MODS_ON_LIST"))); };
+    if versions.is_empty() {
+        return Err(Box::new(std::io::Error::new(
+            ErrorKind::Other,
+            "NO_MODS_ON_LIST",
+        )));
+    };
 
     Ok(versions)
 }
 
-pub fn userlist_get_all_current_versions_with_mods(config: Cfg, list_id: String) -> Result<Vec<(String, String)>, Box<dyn std::error::Error>> {
+pub fn userlist_get_all_current_versions_with_mods(
+    config: Cfg,
+    list_id: String,
+) -> Result<Vec<(String, String)>, Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
     let mut versions: Vec<(String, String)> = Vec::new();
-    let mut stmt = connection.prepare(format!("SELECT mod_id, current_version FROM {}", list_id).as_str())?;
+    let mut stmt =
+        connection.prepare(format!("SELECT mod_id, current_version FROM {}", list_id).as_str())?;
     let id_iter = stmt.query_map([], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?])
+        Ok(vec![
+            row.get::<usize, String>(0)?,
+            row.get::<usize, String>(1)?,
+        ])
     })?;
 
     for ver in id_iter {
         let out = ver?;
         versions.push((out[0].to_owned(), out[1].to_owned()));
-    };
+    }
 
-    if versions.is_empty() { return Err(Box::new(std::io::Error::new(ErrorKind::Other, "NO_MODS_ON_LIST"))); };
+    if versions.is_empty() {
+        return Err(Box::new(std::io::Error::new(
+            ErrorKind::Other,
+            "NO_MODS_ON_LIST",
+        )));
+    };
 
     Ok(versions)
 }
 
-pub fn userlist_get_set_version(config:Cfg, list_id: &str, mod_id: &str) -> MLE<bool> {
+pub fn userlist_get_set_version(config: Cfg, list_id: &str, mod_id: &str) -> MLE<bool> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
     let mut set_version: bool = false;
-    let mut stmt = connection.prepare(format!("SELECT set_version FROM {} WHERE mod_id = ?", list_id).as_str())?;
-    let ver_iter = stmt.query_map([&mod_id], |row| {
-        row.get::<usize, bool>(0)
-    })?;
+    let mut stmt = connection
+        .prepare(format!("SELECT set_version FROM {} WHERE mod_id = ?", list_id).as_str())?;
+    let ver_iter = stmt.query_map([&mod_id], |row| row.get::<usize, bool>(0))?;
 
     for ver in ver_iter {
         set_version = ver?;
-    };
+    }
 
     Ok(set_version)
 }
 
-pub fn userlist_change_versions(config: Cfg, list_id: String, current_version: String, versions: String, link: String, mod_id: String) -> MLE<()> {
+pub fn userlist_change_versions(
+    config: Cfg,
+    list_id: String,
+    current_version: String,
+    versions: String,
+    link: String,
+    mod_id: String,
+) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
@@ -326,33 +409,45 @@ pub fn userlist_change_versions(config: Cfg, list_id: String, current_version: S
     Ok(())
 }
 
-pub fn userlist_add_disabled_versions(config: Cfg, list_id: String, disabled_version: String, mod_id: String) -> MLE<()> {
+pub fn userlist_add_disabled_versions(
+    config: Cfg,
+    list_id: String,
+    disabled_version: String,
+    mod_id: String,
+) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
-    
-    let currently_disabled_versions = userlist_get_disabled_versions(config, String::from(&list_id), String::from(&mod_id))?;
-    let disabled_versions = match currently_disabled_versions == "NONE" { 
+
+    let currently_disabled_versions =
+        userlist_get_disabled_versions(config, String::from(&list_id), String::from(&mod_id))?;
+    let disabled_versions = match currently_disabled_versions == "NONE" {
         true => disabled_version,
         false => format!("{}|{}", currently_disabled_versions, disabled_version),
     };
-    
-    connection.execute(format!("UPDATE {} SET disabled_versions = ?1 WHERE mod_id = ?2", list_id).as_str(), [disabled_versions, mod_id])?;
+
+    connection.execute(
+        format!(
+            "UPDATE {} SET disabled_versions = ?1 WHERE mod_id = ?2",
+            list_id
+        )
+        .as_str(),
+        [disabled_versions, mod_id],
+    )?;
     Ok(())
 }
 
-pub fn userlist_get_disabled_versions(config:Cfg, list_id: String, mod_id: String) -> MLE<String> {
+pub fn userlist_get_disabled_versions(config: Cfg, list_id: String, mod_id: String) -> MLE<String> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
     let mut version: String = String::new();
-    let mut stmt = connection.prepare(format!("SELECT disabled_versions FROM {} WHERE mod_id = ?", list_id).as_str())?;
-    let ver_iter = stmt.query_map([mod_id], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let mut stmt = connection
+        .prepare(format!("SELECT disabled_versions FROM {} WHERE mod_id = ?", list_id).as_str())?;
+    let ver_iter = stmt.query_map([mod_id], |row| row.get::<usize, String>(0))?;
 
     for ver in ver_iter {
         version = ver?;
-    };
+    }
 
     match version.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "GDV_MOD_NOT_FOUND")),
@@ -360,36 +455,57 @@ pub fn userlist_get_disabled_versions(config:Cfg, list_id: String, mod_id: Strin
     }
 }
 
-pub fn userlist_get_all_downloads(config: Cfg, list_id: String) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+pub fn userlist_get_all_downloads(
+    config: Cfg,
+    list_id: String,
+) -> Result<Vec<String>, Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
     let mut links: Vec<String> = Vec::new();
-    let mut stmt = connection.prepare(format!("SELECT current_download FROM {}", list_id).as_str())?;
-    let link_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let mut stmt =
+        connection.prepare(format!("SELECT current_download FROM {}", list_id).as_str())?;
+    let link_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for link in link_iter {
         let l = link?;
         println!("Found link {}", String::from(&l));
         links.push(l)
-    };
+    }
 
-    if links.is_empty() { return Err(Box::new(std::io::Error::new(ErrorKind::Other, "NO_MODS_ON_LIST"))); };
+    if links.is_empty() {
+        return Err(Box::new(std::io::Error::new(
+            ErrorKind::Other,
+            "NO_MODS_ON_LIST",
+        )));
+    };
 
     Ok(links)
 }
 
 //lists
 ///Inserts into lists table and creates new table
-pub fn lists_insert(config: Cfg, id: String, mc_version: String, mod_loader: Modloader, download_folder: String) -> MLE<()> {
+pub fn lists_insert(
+    config: Cfg,
+    id: String,
+    mc_version: String,
+    mod_loader: Modloader,
+    download_folder: String,
+) -> MLE<()> {
     println!("Creating list {}", id);
 
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute("INSERT INTO lists VALUES (?1, ?2, ?3, ?4)", [id.clone(), mc_version, mod_loader.to_string(), download_folder])?;
+    connection.execute(
+        "INSERT INTO lists VALUES (?1, ?2, ?3, ?4)",
+        [
+            id.clone(),
+            mc_version,
+            mod_loader.to_string(),
+            download_folder,
+        ],
+    )?;
     connection.execute(format!("CREATE TABLE {}( 'mod_id' TEXT, 'current_version' TEXT, 'applicable_versions' BLOB, 'current_download' TEXT, 'disabled_versions' TEXT DEFAULT 'NONE', 'set_version' INTEGER, CONSTRAINT {}_PK PRIMARY KEY (mod_id) )", id, id).as_str(), [])?;
 
     Ok(())
@@ -408,44 +524,62 @@ pub fn lists_get(config: Cfg, list_id: String) -> MLE<List> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
-    let mut list = List { id: String::new(), mc_version: String::new(), modloader: Modloader::Fabric, download_folder: String::new() };
-    let mut stmt = connection.prepare("SELECT mc_version, modloader, download_folder FROM lists WHERE id = ?")?;
+    let mut list = List {
+        id: String::new(),
+        mc_version: String::new(),
+        modloader: Modloader::Fabric,
+        download_folder: String::new(),
+    };
+    let mut stmt = connection
+        .prepare("SELECT mc_version, modloader, download_folder FROM lists WHERE id = ?")?;
 
     let list_iter = stmt.query_map([&list_id], |row| {
-        Ok(vec![row.get::<usize, String>(0)?, row.get::<usize, String>(1)?, row.get::<usize, String>(2)?])
+        Ok(vec![
+            row.get::<usize, String>(0)?,
+            row.get::<usize, String>(1)?,
+            row.get::<usize, String>(2)?,
+        ])
     })?;
 
     for l in list_iter {
         let li = l?;
-        list = List { id: String::from(&list_id), mc_version: String::from(&li[0]), modloader: Modloader::from(&li[1])?, download_folder: String::from(&li[2]) };
-    };
+        list = List {
+            id: String::from(&list_id),
+            mc_version: String::from(&li[0]),
+            modloader: Modloader::from(&li[1])?,
+            download_folder: String::from(&li[2]),
+        };
+    }
+
+    if list.id.is_empty() {
+        return Err(MLError::new(ErrorType::DBError, "LIST_NOT_FOUND"));
+    }
 
-    if list.id.is_empty() { return Err(MLError::new(ErrorType::DBError, "LIST_NOT_FOUND")); }
-    
     Ok(list)
 }
 
-pub fn lists_version(config: Cfg, list_id: String, version: String) -> MLE<()> {
+pub fn lists_version(config: Cfg, list_id: &str, version: &str) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
 
-    connection.execute("UPDATE lists SET mc_version = ? WHERE id = ?", [version, list_id])?;
+    connection.execute(
+        "UPDATE lists SET mc_version = ? WHERE id = ?",
+        [version, list_id],
+    )?;
     Ok(())
 }
 
 pub fn lists_get_all_ids(config: Cfg) -> MLE<Vec<String>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
-    
+
     let mut list_ids: Vec<String> = Vec::new();
     let mut stmt = connection.prepare("SELECT id FROM lists")?;
-    let id_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let id_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for id in id_iter {
         list_ids.push(id?)
-    };
+    }
 
     match list_ids.is_empty() {
         true => Err(MLError::new(ErrorType::DBError, "NO_LISTS")),
@@ -458,35 +592,50 @@ pub fn config_change_current_list(config: Cfg, id: String) -> MLE<()> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute("UPDATE user_config SET value = ? WHERE id = 'current_list'", [id])?;
+    connection.execute(
+        "UPDATE user_config SET value = ? WHERE id = 'current_list'",
+        [id],
+    )?;
     Ok(())
 }
 
 pub fn config_get_current_list(config: Cfg) -> MLE<String> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data).unwrap();
-    
+
     let mut list_id = String::new();
     let mut stmt = connection.prepare("SELECT value FROM user_config WHERE id = 'current_list'")?;
-    let list_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let list_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for list in list_iter {
         list_id = list?;
-    };
+    }
+
+    if list_id.is_empty() {
+        return Err(MLError::new(ErrorType::DBError, "NO_CURRENT_LIST"));
+    }
 
-    if list_id.is_empty() { return Err(MLError::new(ErrorType::DBError, "NO_CURRENT_LIST")); }
-    
     Ok(list_id)
 }
 
 //SETUP(UPDATES)
-pub fn s_userlist_update_download(config: Cfg, list_id: String, mod_id: String, link: String) -> Result<(), Box<dyn std::error::Error>> {
+pub fn s_userlist_update_download(
+    config: Cfg,
+    list_id: String,
+    mod_id: String,
+    link: String,
+) -> Result<(), Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute(format!("UPDATE {} SET current_download = ?1 WHERE mod_id = ?2", list_id).as_str(), [link, mod_id])?;
+    connection.execute(
+        format!(
+            "UPDATE {} SET current_download = ?1 WHERE mod_id = ?2",
+            list_id
+        )
+        .as_str(),
+        [link, mod_id],
+    )?;
     Ok(())
 }
 
@@ -494,7 +643,10 @@ pub fn s_config_create_version(config: Cfg) -> Result<(), Box<dyn std::error::Er
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute("INSERT INTO 'user_config' VALUES ( 'db_version', '0.2' )", ())?;
+    connection.execute(
+        "INSERT INTO 'user_config' VALUES ( 'db_version', '0.2' )",
+        (),
+    )?;
     Ok(())
 }
 
@@ -502,34 +654,46 @@ pub fn s_config_update_version(config: Cfg, ver: String) -> Result<(), Box<dyn s
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
-    connection.execute("UPDATE user_config SET value = ? WHERE id = 'db_version'", [ver])?;
+    connection.execute(
+        "UPDATE user_config SET value = ? WHERE id = 'db_version'",
+        [ver],
+    )?;
     Ok(())
 }
 
 pub fn s_config_get_version(config: Cfg) -> Result<String, Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
-    
+
     let mut version: String = String::new();
     let mut stmt = connection.prepare("SELECT value FROM user_config WHERE id = 'db_version'")?;
-    let ver_iter = stmt.query_map([], |row| {
-        row.get::<usize, String>(0)
-    })?;
+    let ver_iter = stmt.query_map([], |row| row.get::<usize, String>(0))?;
 
     for ver in ver_iter {
         version = ver?;
-    };
+    }
 
-    if version.is_empty() { return Err(Box::new(std::io::Error::new(ErrorKind::Other, "NO_DBVERSION"))); };
+    if version.is_empty() {
+        return Err(Box::new(std::io::Error::new(
+            ErrorKind::Other,
+            "NO_DBVERSION",
+        )));
+    };
     Ok(version)
 }
 
-pub fn s_insert_column(config: Cfg, table: String, column: String, c_type: String, default: Option<String>) -> Result<(), Box<dyn std::error::Error>> {
+pub fn s_insert_column(
+    config: Cfg,
+    table: String,
+    column: String,
+    c_type: String,
+    default: Option<String>,
+) -> Result<(), Box<dyn std::error::Error>> {
     let data = devdir(format!("{}/data.db", config.data).as_str());
     let connection = Connection::open(data)?;
 
     let mut sql = format!("ALTER TABLE {} ADD '{}' {}", table, column, c_type);
-    
+
     if default.is_some() {
         sql = format!("{} DEFAULT {}", sql, default.unwrap());
     }
@@ -539,7 +703,6 @@ pub fn s_insert_column(config: Cfg, table: String, column: String, c_type: Strin
 }
 
 pub fn db_setup(config: Cfg) -> MLE<()> {
-    
     println!("Initiating database");
 
     let data = devdir(format!("{}/data.db", config.data).as_str());
@@ -552,6 +715,6 @@ pub fn db_setup(config: Cfg) -> MLE<()> {
          INSERT INTO 'user_config' VALUES ( 'db_version', '0.5' );
          INSERT INTO 'user_config' VALUES ( 'current_list', '...' )",
     )?;
-    
+
     Ok(())
 }
diff --git a/src/error.rs b/src/error.rs
index 794a919..bd6e3da 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -43,49 +43,70 @@ impl fmt::Display for MLError {
             ErrorType::LibReq => write!(f, "REQWEST"),
             ErrorType::LibChrono => write!(f, "Chrono error: {}", self.message),
             ErrorType::IoError => write!(f, "IO"),
-            ErrorType::Other => write!(f, "OTHER")
+            ErrorType::Other => write!(f, "OTHER"),
         }
     }
 }
 
 impl From<reqwest::Error> for MLError {
     fn from(error: reqwest::Error) -> Self {
-        Self { etype: ErrorType::LibReq, message: error.to_string() }
+        Self {
+            etype: ErrorType::LibReq,
+            message: error.to_string(),
+        }
     }
 }
 
 impl From<toml::de::Error> for MLError {
     fn from(error: toml::de::Error) -> Self {
-        Self { etype: ErrorType::LibToml, message: error.to_string() }
+        Self {
+            etype: ErrorType::LibToml,
+            message: error.to_string(),
+        }
     }
 }
 
 impl From<rusqlite::Error> for MLError {
     fn from(error: rusqlite::Error) -> Self {
-        Self { etype: ErrorType::LibSql, message: error.to_string() }
+        Self {
+            etype: ErrorType::LibSql,
+            message: error.to_string(),
+        }
     }
 }
 
 impl From<toml::ser::Error> for MLError {
     fn from(error: toml::ser::Error) -> Self {
-        Self { etype: ErrorType::LibToml, message: error.to_string() }
+        Self {
+            etype: ErrorType::LibToml,
+            message: error.to_string(),
+        }
     }
 }
 
 impl From<chrono::ParseError> for MLError {
     fn from(error: chrono::ParseError) -> Self {
-        Self { etype: ErrorType::LibChrono, message: error.to_string() }
+        Self {
+            etype: ErrorType::LibChrono,
+            message: error.to_string(),
+        }
     }
 }
 
 impl From<std::io::Error> for MLError {
     fn from(error: std::io::Error) -> Self {
-        Self { etype: ErrorType::IoError, message: error.to_string() }
+        Self {
+            etype: ErrorType::IoError,
+            message: error.to_string(),
+        }
     }
 }
 
 impl MLError {
     pub fn new(etype: ErrorType, message: &str) -> Self {
-        Self { etype, message: String::from(message) }
+        Self {
+            etype,
+            message: String::from(message),
+        }
     }
 }
diff --git a/src/files.rs b/src/files.rs
index 6519c6a..6160cb4 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -1,11 +1,20 @@
-use std::{fs::{File, read_dir, remove_file, rename}, io::Write, collections::HashMap};
 use futures_util::StreamExt;
 use reqwest::Client;
-
-use crate::{List, modrinth::Version, db::{userlist_add_disabled_versions, mods_get_info}, config::Cfg, error::{MLE, MLError, ErrorType}};
+use std::{
+    collections::HashMap,
+    fs::{read_dir, remove_file, rename, File},
+    io::Write,
+};
+
+use crate::{
+    config::Cfg,
+    db::{mods_get_info, userlist_add_disabled_versions},
+    error::{ErrorType, MLError, MLE},
+    modrinth::Version,
+    List,
+};
 
 pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>) -> MLE<String> {
-
     let dl_path = String::from(&list.download_folder);
 
     println!("  └Download mods to {}", dl_path);
@@ -21,7 +30,13 @@ pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>)
             Ok(e) => e,
             Err(..) => return Err(MLError::new(ErrorType::Other, "NO_FILE_EXTENSION")),
         };
-        let filename = format!("{}.mr.{}.{}.{}", splitname.join("."), ver.project_id, ver.id, extension);
+        let filename = format!(
+            "{}.mr.{}.{}.{}",
+            splitname.join("."),
+            ver.project_id,
+            ver.id,
+            extension
+        );
         download_file(primary_file.url, list.clone().download_folder, filename).await?;
         //tokio::time::sleep(std::time::Duration::new(3, 0)).await;
         println!(" ✓");
@@ -32,10 +47,7 @@ pub async fn download_versions(list: List, config: Cfg, versions: Vec<Version>)
 
 async fn download_file(url: String, path: String, name: String) -> MLE<()> {
     let dl_path_file = format!("{}/{}", path, name);
-    let res = Client::new()
-        .get(String::from(&url))
-        .send()
-        .await?;
+    let res = Client::new().get(String::from(&url)).send().await?;
 
     // download chunks
     let mut file = File::create(&dl_path_file)?;
@@ -49,7 +61,12 @@ async fn download_file(url: String, path: String, name: String) -> MLE<()> {
     Ok(())
 }
 
-pub fn disable_version(config: Cfg, current_list: List, versionid: String, mod_id: String) -> MLE<()> {
+pub fn disable_version(
+    config: Cfg,
+    current_list: List,
+    versionid: String,
+    mod_id: String,
+) -> MLE<()> {
     //println!("Disabling version {} for mod {}", versionid, mod_id);
     let file = get_file_path(current_list.clone(), String::from(&versionid))?;
     let disabled = format!("{}.disabled", file);
@@ -63,7 +80,7 @@ pub fn disable_version(config: Cfg, current_list: List, versionid: String, mod_i
 
 pub fn delete_version(list: List, version: String) -> MLE<()> {
     let file = get_file_path(list, version)?;
-    
+
     remove_file(file)?;
 
     Ok(())
@@ -76,19 +93,24 @@ pub fn get_file_path(list: List, versionid: String) -> MLE<String> {
         if path.is_file() {
             let pathstr = match path.to_str().ok_or("") {
                 Ok(s) => s,
-                Err(..) => return Err(MLError::new(ErrorType::Other, "INVALID_PATH"))
+                Err(..) => return Err(MLError::new(ErrorType::Other, "INVALID_PATH")),
             };
             let namesplit: Vec<&str> = pathstr.split('.').collect();
             let ver_id = namesplit[namesplit.len() - 2];
             names.insert(String::from(ver_id), String::from(pathstr));
         }
-    };
+    }
 
     let filename = match names.get(&versionid).ok_or("") {
         Ok(n) => n,
-        Err(..) => return Err(MLError::new(ErrorType::ArgumentError, "VERSION_NOT_FOUND_IN_FILES"))
+        Err(..) => {
+            return Err(MLError::new(
+                ErrorType::ArgumentError,
+                "VERSION_NOT_FOUND_IN_FILES",
+            ))
+        }
     };
-    
+
     Ok(filename.to_owned())
 }
 
@@ -99,7 +121,10 @@ pub fn get_downloaded_versions(list: List) -> MLE<HashMap<String, String>> {
         if path.is_file() && path.extension().ok_or("BAH").unwrap() == "jar" {
             let pathstr = path.to_str().ok_or("BAH").unwrap();
             let namesplit: Vec<&str> = pathstr.split('.').collect();
-            versions.insert(String::from(namesplit[namesplit.len() - 3]), String::from(namesplit[namesplit.len() - 2]));
+            versions.insert(
+                String::from(namesplit[namesplit.len() - 3]),
+                String::from(namesplit[namesplit.len() - 2]),
+            );
         }
     }
     Ok(versions)
@@ -111,6 +136,6 @@ pub fn clean_list_dir(list: &List) -> MLE<()> {
     for entry in std::fs::read_dir(dl_path)? {
         let entry = entry?;
         std::fs::remove_file(entry.path())?;
-    };
+    }
     Ok(())
 }
diff --git a/src/input.rs b/src/input.rs
deleted file mode 100644
index 6c62ab7..0000000
--- a/src/input.rs
+++ /dev/null
@@ -1,344 +0,0 @@
-use crate::{error::{MLE, MLError, ErrorType}, Modloader, config::Cfg, db::lists_get, get_current_list, List, modrinth::{get_minecraft_version, MCVersionType}, IDSelector};
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Input {
-    pub command: Option<Cmd>,
-    pub mod_options: Option<ModOptions>,
-    pub mod_id: Option<IDSelector>,
-    pub set_version: bool,
-    pub all_lists: bool,
-    pub clean: bool,
-    pub direct_download: bool,
-    pub delete_old: bool,
-    pub list: Option<List>,
-    pub list_options: Option<ListOptions>,
-    pub list_id: Option<String>,
-    pub list_mcversion: Option<String>,
-    pub modloader: Option<Modloader>,
-    pub directory: Option<String>,
-    pub io_options: Option<IoOptions>,
-    pub file: Option<String>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Cmd {
-    Mod,
-    List,
-    Update,
-    Download,
-    Io,
-    Version,
-    Setup,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ModOptions {
-    Add,
-    Remove
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ListOptions {
-    Add,
-    Remove,
-    Change,
-    Version,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum IoOptions {
-    Export,
-    Import
-}
-
-impl Input {
-    fn from(config: Cfg, input: Vec<String>) -> MLE<Self> {
-        let input_string = input.join(" ");
-        let mut args: Vec<&str> = input_string.split(" -").collect();
-        args[0] = args[0].split_at(1).1;
-        
-        let mut command: Option<Cmd> = None;
-        
-        let mut mod_options: Option<ModOptions> = None;
-        let mut mod_id: Option<IDSelector> = None;
-        let mut set_version = false;
-        let mut all_lists = false;
-        let mut clean = false;
-        let mut direct_download = true;
-        let mut delete_old = false;
-        let mut list: Option<List> = None;
-        let mut list_options: Option<ListOptions> = None;
-        let mut list_id: Option<String> = None;
-        let mut list_mcversion: Option<String> = None;
-        let mut modloader: Option<Modloader> = None;
-        let mut directory: Option<String> = None;
-        let mut io_options: Option<IoOptions> = None;
-        let mut file: Option<String> = None;
-        
-        for arg in args {
-            let arg_split: Vec<&str> = arg.trim().split(' ').collect();
-            match arg_split[0] {
-                "v" | "version" => {
-                    command = Some(Cmd::Version);
-                },
-                "d" | "download" => {
-                    command = Some(Cmd::Download);
-                },
-                "u" | "update" => {
-                    command = Some(Cmd::Update);
-                },
-                "ma" => {
-                    command = Some(Cmd::Mod);
-                    mod_options = Some(ModOptions::Add);
-                    if arg_split.len() == 2 {
-                        mod_id = Some(IDSelector::ModificationID(String::from(arg_split[1])));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a list mod slug or id"));
-                    }
-                },
-                //TODO impl this
-                "mv" => {
-                    command = Some(Cmd::Mod);
-                    mod_options = Some(ModOptions::Add);
-                    if arg_split.len() == 2 {
-                        mod_id = Some(IDSelector::VersionID(String::from(arg_split[1])));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a version id"));
-                    };
-                },
-                "mr" => {
-                    command = Some(Cmd::Mod);
-                    mod_options = Some(ModOptions::Remove);
-                    if arg_split.len() == 2 {
-                        mod_id = Some(IDSelector::ModificationID(String::from(arg_split[1])));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a mod id"));
-                    };
-                },
-                "set_version" => {
-                    set_version = true;
-                },
-                "all_lists" => {
-                    all_lists = true;
-                },
-                "clean" => {
-                    clean = true;
-                },
-                "no_download" => {
-                    direct_download = false;
-                },
-                "delete_old" => {
-                    delete_old = true;
-                },
-                "l" => {
-                    if arg_split.len() == 2 {
-                        list = Some(lists_get(config.clone(), String::from(arg_split[1]))?);
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a list via it's id"));
-                    }
-                }
-                "la" => {
-                    command = Some(Cmd::List);
-                    list_options = Some(ListOptions::Add);
-                    if arg_split.len() == 2 {
-                        list_id = Some(String::from(arg_split[1]));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please give the new list an id"));
-                    }
-                },
-                "lr" => {
-                    command = Some(Cmd::List);
-                    list_options = Some(ListOptions::Remove);
-                },
-                "lc" => {
-                    command = Some(Cmd::List);
-                    list_options = Some(ListOptions::Change);
-                },
-                "lv" => {
-                    command = Some(Cmd::List);
-                    list_options = Some(ListOptions::Version);
-                    if arg_split.len() == 2 {
-                        list_mcversion = Some(String::from(arg_split[1]));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a minecraft version"));
-                    }
-                },
-                "mcv" => {
-                    if arg_split.len() == 2 {
-                        list_mcversion = Some(String::from(arg_split[1]));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a minecraft version"));
-                    }
-                },
-                "ml" => {
-                    if arg_split.len() == 2 {
-                        modloader = Some(Modloader::from(arg_split[1])?);
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a modloader"));
-                    }
-                },
-                "dir" => {
-                    if arg_split.len() == 2 {
-                        directory = Some(String::from(arg_split[1]));
-                    } else {
-                        return Err(MLError::new(ErrorType::ArgumentError, "Please specify a directory"));
-                    }
-                },
-                "export" => {
-                    command = Some(Cmd::Io);
-                    io_options = Some(IoOptions::Export);
-                },
-                "import" => {
-                    command = Some(Cmd::Io);
-                    io_options = Some(IoOptions::Import);
-                },
-                "f" => {
-                    file = Some(String::from(arg_split[1]));
-                },
-                "setup" => {
-                    command = Some(Cmd::Setup);
-                }
-                _ => return Err(MLError::new(ErrorType::ArgumentError, format!("Unknown Argument ({})", arg_split[0]).as_str())),
-            }
-        }
-
-        Ok(Self {
-            command,
-            mod_options,
-            mod_id,
-            set_version,
-            all_lists,
-            clean,
-            direct_download,
-            delete_old,
-            list,
-            list_options,
-            list_id,
-            list_mcversion,
-            modloader,
-            directory,
-            io_options,
-            file
-        })
-    }
-}
-
-pub async fn get_input(config: Cfg, args: Vec<String>) -> MLE<Input> {
-    let input = Input::from(config.clone(), args)?;
-    
-    if input.command.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "No command specified")); };
-    
-    match input.clone().command.unwrap() {
-        Cmd::Mod => check_mod(input, config),
-        Cmd::List => check_list(input, config).await,
-        _ => Ok(input),
-    }
-}
-
-fn check_mod(mut input: Input, config: Cfg) -> MLE<Input> {
-    if input.mod_options.is_none() {
-        return Err(MLError::new(ErrorType::ArgumentError, "No mod option"));
-    };
-    match input.clone().mod_options.unwrap() {
-        ModOptions::Add => {
-            if input.mod_id.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "No mod id/slug or version id")); };
-            if input.list_id.is_none() { input.list = Some(get_current_list(config)?); };
-            Ok(input)
-        },
-        ModOptions::Remove => {
-            if input.mod_id.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "MODS_NO_MODID")); };
-            if input.list_id.is_none() { input.list = Some(get_current_list(config)?); };
-            Ok(input)
-        },
-    }
-}
-
-async fn check_list(mut input: Input, config: Cfg) -> MLE<Input> {
-    if input.list_options.is_none() {
-        return Err(MLError::new(ErrorType::ArgumentError, "NO_LIST_ARGUMENT"));
-    };
-    match input.clone().list_options.unwrap() {
-        ListOptions::Add => {
-            if input.list_id.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "no list id specified")); };
-            if input.list_mcversion.is_none() {
-                println!("No Minecraft Version specified, defaulting to latest release");
-                input.list_mcversion = Some(get_minecraft_version(&config.apis.modrinth, MCVersionType::Release).await);
-            };
-            if input.directory.is_none() {
-                let id = input.clone().list_id.unwrap();
-                println!("No download directory specified, defaulting to ./downloads/{}", id);
-                input.directory = Some(format!("./downloads/{}", id))
-            };
-            if input.modloader.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "no modloader specified")); };
-            Ok(input)
-        },
-        ListOptions::Remove => {
-            if input.list.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "NO_LIST_SPECIFIED")); };
-            Ok(input)
-        },
-        ListOptions::Change => {
-            if input.list.is_none() { return Err(MLError::new(ErrorType::ArgumentError, "NO_LIST_SPECIFIED")); };
-            Ok(input)
-        },
-        ListOptions::Version => {
-            if input.list.is_none() {
-                println!("No list specified, using default");
-                input.list = Some(get_current_list(config)?);
-            };
-            Ok(input)
-        }
-    }
-}
-
-#[test]
-fn input_from() {
-    let config = Cfg::init("modlist.toml").unwrap();
-    assert_eq!(
-        Input::from(config, vec![String::from("-la test -lv 1.19.3")]).unwrap(),
-        Input {
-            command: Some(Cmd::List),
-            mod_options: None,
-            mod_id: None,
-            set_version: false,
-            all_lists: false,
-            clean: false,
-            direct_download: false,
-            delete_old: false,
-            list: None,
-            list_options: Some(ListOptions::Add),
-            list_id: Some(String::from("test")),
-            list_mcversion: Some(String::from("1.19.3")),
-            modloader: None,
-            directory: None,
-            io_options: None,
-            file: None,
-        }
-    );
-
-}
-
-#[tokio::test]
-async fn get_input_test() {
-    let config = Cfg::init("modlist.toml").unwrap();
-    assert_eq!(
-        get_input(config.clone(), vec![String::from("-ma test")]).await.unwrap(),
-        Input {
-            command: Some(Cmd::Mod),
-            mod_options: Some(ModOptions::Add),
-            mod_id: Some(IDSelector::ModificationID(String::from("test"))),
-            set_version: false,
-            all_lists: false,
-            clean: false,
-            direct_download: false,
-            delete_old: false,
-            list: Some(lists_get(config.clone(), String::from("one")).unwrap()),
-            list_options: None,
-            list_id: None,
-            list_mcversion: None,
-            modloader: None,
-            directory: None,
-            io_options: None,
-            file: None
-        }
-    )
-}
diff --git a/src/lib.rs b/src/lib.rs
index eb845d8..43f0fe7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,36 +1,37 @@
 pub mod apis;
-pub mod config;
 pub mod commands;
-pub mod input;
+pub mod config;
 pub mod db;
 pub mod error;
 pub mod files;
 
-use std::path::Path;
+use std::{fmt::Display, path::Path};
 
 pub use apis::*;
 pub use commands::*;
-use error::{MLE, ErrorType, MLError};
+use error::{ErrorType, MLError, MLE};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Modloader {
     Fabric,
-    Forge
+    Forge,
 }
 
 impl Modloader {
-    fn to_string(&self) -> String {
-        match self {
-            Modloader::Fabric => String::from("fabric"),
-            Modloader::Forge => String::from("forge"),
-        }
-    }
-
-    fn from(string: &str) -> MLE<Modloader> {
+    pub fn from(string: &str) -> MLE<Modloader> {
         match string {
             "forge" => Ok(Modloader::Forge),
             "fabric" => Ok(Modloader::Fabric),
-            _ => Err(MLError::new(ErrorType::ArgumentError, "UNKNOWN_MODLOADER"))
+            _ => Err(MLError::new(ErrorType::ArgumentError, "UNKNOWN_MODLOADER")),
+        }
+    }
+}
+
+impl Display for Modloader {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Modloader::Fabric => write!(f, "fabric"),
+            Modloader::Forge => write!(f, "forge"),
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 32727c7..2006856 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,65 +1,269 @@
-use std::{env, process};
+use clap::{Parser, Subcommand};
+use modlist::{
+    config::Cfg,
+    db::{config_get_current_list, lists_get, lists_get_all_ids},
+    devdir, download, export, get_current_list, import, list_add, list_change, list_remove,
+    list_version, mod_add, mod_remove, update, IDSelector, List, Modloader,
+};
 
-use modlist::{config::Cfg, input::{get_input, Cmd}, update, download, list, io, modification, setup};
+//TODO implement remote sql db
+
+//TODO make default list optional
+#[derive(Parser)]
+#[command(author, version, about)]
+struct Cli {
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    r#Mod {
+        #[command(subcommand)]
+        command: ModCommands,
+    },
+    List {
+        #[command(subcommand)]
+        command: ListCommands,
+    },
+    Download {
+        /// download all lists
+        #[arg(short, long)]
+        all: bool,
+
+        /// clean all mods before downloading them
+        #[arg(short, long)]
+        clean: bool,
+
+        /// remove disabled versions
+        #[arg(short, long)]
+        remove: bool,
+    },
+    Update {
+        /// download all lists
+        #[arg(short, long)]
+        all: bool,
+
+        /// directly download updated mods
+        #[arg(short, long)]
+        download: bool,
+
+        /// clean all mods before downloading them
+        #[arg(short, long)]
+        clean: bool,
+
+        /// delete disabled versions
+        #[arg(short, long)]
+        remove: bool,
+    },
+    Import {
+        #[arg(short, long)]
+        file: Option<String>,
+
+        /// directly download imported mods
+        #[arg(short, long)]
+        download: bool,
+    },
+    Export {
+        /// the list you want to export
+        list: Option<String>,
+    },
+}
+
+#[derive(Subcommand)]
+enum ModCommands {
+    Add {
+        /// id of the mod/version
+        id: String,
+
+        /// set id mode to version
+        #[arg(short, long)]
+        version: bool,
+
+        /// directly download the mod
+        #[arg(short, long)]
+        download: bool,
+
+        /// lock the version added
+        #[arg(/* short , */long)]
+        lock: bool,
+
+        /// optional List selection, else default list will be used
+        #[arg(short, long)]
+        list: Option<String>,
+    },
+    Remove {
+        /// id, name or title of the mod
+        id: String,
+
+        /// optional List selection, else default list will be used
+        #[arg(short, long)]
+        list: Option<String>,
+    },
+}
+
+#[derive(Subcommand)]
+enum ListCommands {
+    Add {
+        /// list id
+        id: String,
+
+        directory: String,
+
+        modloader: Option<String>,
+
+        version: Option<String>,
+    },
+    Remove {
+        /// id, name or title of the list
+        id: String,
+    },
+    List,
+    Change {
+        /// id of the list to change to
+        id: String,
+    },
+    Version {
+        /// list id
+        id: String,
+        /// desired minecraft version
+        version: String,
+
+        /// directly download updated mods
+        #[arg(long, short)]
+        download: bool,
+
+        /// delete disabled versions
+        #[arg(short, long)]
+        remove: bool,
+    },
+}
 
 #[tokio::main]
 async fn main() {
+    let cli = Cli::parse();
+
     let config = Cfg::init("modlist.toml").unwrap();
-    
-    let mut args: Vec<String> = env::args().collect();
-    args.reverse();
-    args.pop();
-    args.reverse();
-
-    if args.is_empty() {
-        println!("Please enter an argument");
-        process::exit(1);
-    };
-    
-    let input = match get_input(config.clone(), args).await {
-        Ok(i) => i,
-        Err(e) => {
-            println!("{}", e);
-            process::exit(1);
+    println!("{:?}", config);
+
+    //TODO setup? maybe setup on install
+    match cli.command {
+        Commands::Mod { command } => {
+            match command {
+                #[allow(unused_variables)]
+                ModCommands::Add {
+                    id,
+                    version,
+                    list,
+                    download,
+                    lock,
+                } => {
+                    let listf = match list {
+                        Some(list) => lists_get(config.clone(), list).unwrap(),
+                        None => lists_get(
+                            config.clone(),
+                            config_get_current_list(config.clone()).unwrap(),
+                        )
+                        .unwrap(),
+                    };
+
+                    let marked_id = match version {
+                        true => IDSelector::VersionID(id),
+                        false => IDSelector::ModificationID(id),
+                    };
+
+                    mod_add(config, vec![marked_id], listf, download, lock).await
+                }
+                ModCommands::Remove { id, list } => {
+                    //TODO add output
+                    //TODO add success even if no file found
+                    let listf = match list {
+                        Some(list) => lists_get(config.clone(), list).unwrap(),
+                        None => lists_get(
+                            config.clone(),
+                            config_get_current_list(config.clone()).unwrap(),
+                        )
+                        .unwrap(),
+                    };
+                    mod_remove(config, &id, listf)
+                }
+            }
         }
-    };
-
-    match input.clone().command.unwrap() {
-        Cmd::Mod => {
-            modification(config, input).await
-        },
-        Cmd::List => {
-            list(config, input).await
-        },
-        Cmd::Update => {
-            update(config, input).await
-        },
-        Cmd::Download => {
-            download(config, input).await
-        },
-        Cmd::Io => {
-            io(config, input).await
-        },
-        Cmd::Version => {
-            show_version();
-            Ok(())
-        },
-        Cmd::Setup => {
-            setup(config).await
-        },
-    }.unwrap()
-}
+        Commands::List { command } => {
+            match command {
+                ListCommands::Add {
+                    id,
+                    directory,
+                    modloader,
+                    version,
+                } => {
+                    let ml = match modloader {
+                        Some(ml) => Modloader::from(&ml).unwrap(),
+                        //TODO add default modloader to config
+                        None => Modloader::Fabric,
+                    };
 
-fn show_version() {
-    match std::env::var("DEV") {
-        Ok(dev) => {
-            let devint = dev.parse::<i32>().unwrap();
-            if devint >= 1 {
-                println!("Modlist by FxQnLr v{} (DEV)", env!("CARGO_PKG_VERSION"));
+                    let ver = match version {
+                        Some(ver) => ver,
+                        //TODO get latest version
+                        //TODO impl config for specific version or latest or latest snap
+                        None => "1.19.4".to_string(),
+                    };
+
+                    list_add(config, id, ver, ml, directory)
+                }
+                ListCommands::Remove { id } => list_remove(config, id),
+                ListCommands::List => {
+                    todo!()
+                }
+                ListCommands::Change { id } => list_change(config, id),
+                ListCommands::Version {
+                    id,
+                    version,
+                    download,
+                    remove,
+                } => list_version(config, id, version, download, remove).await,
+            }
+        }
+        //TODO a add specific list
+        Commands::Update {
+            all,
+            download,
+            clean,
+            remove,
+        } => {
+            let mut liststack: Vec<List> = vec![];
+            if all {
+                let list_ids = lists_get_all_ids(config.clone()).unwrap();
+                for id in list_ids {
+                    liststack.push(lists_get(config.clone(), id).unwrap());
+                }
             } else {
-                println!("Modlist by FxQnLr v{}", env!("CARGO_PKG_VERSION"));
+                let current = get_current_list(config.clone()).unwrap();
+                println!("Update list {}:", current.id);
+                liststack.push(current)
             }
-        },
-        Err(..) => println!("Modlist by FxQnLr v{}", env!("CARGO_PKG_VERSION")),
+            update(config, liststack, clean, download, remove).await
+        }
+        //TODO add specific list
+        Commands::Download { all, clean, remove } => download(config, all, clean, remove).await,
+        Commands::Import { file, download } => {
+            let filestr: String = match file {
+                Some(args) => args,
+                None => devdir(
+                    dirs::home_dir()
+                        .unwrap()
+                        .join("mlexport.toml")
+                        .into_os_string()
+                        .into_string()
+                        .unwrap()
+                        .as_str(),
+                ),
+            };
+
+            import(config, filestr, download).await
+        }
+        Commands::Export { list } => export(config, list),
     }
+    .unwrap();
 }