diff --git a/Cargo.toml b/Cargo.toml
index 096fb9e..1088be1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,4 +16,4 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 tokio = { version = "1.44.0", features = ["full"] }
 tokio-util = { version = "0.7.13", features = ["codec"] }
-icarus-models = { git = "ssh://git@gitlab.com/kdeng00/icarus-models.git", tag = "dev-v0.1.7-05537a4f6d" }
+icarus-models = { git = "ssh://git@gitlab.com/kdeng00/icarus-models.git", tag = "v0.1.10" }
diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs
index 1040675..d44b5e5 100644
--- a/src/managers/commit_manager.rs
+++ b/src/managers/commit_manager.rs
@@ -51,12 +51,12 @@ impl Album {
         println!("Disc Count: {}\n", self.disc_count);
     }
 
-    pub fn retrieve_song(&self, track: i32, disc: i32) -> Result<models::song::Song> {
+    pub fn retrieve_song(&self, track: i32, disc: i32) -> Result<icarus_models::song::Song> {
         let mut found = false;
-        let mut song = models::song::Song::default();
+        let mut song = icarus_models::song::Song::default();
 
         for song_i in &self.songs {
-            if song_i.track.unwrap() == track && song_i.disc.unwrap() == disc {
+            if song_i.track == track && song_i.disc == disc {
                 song = song_i.clone();
                 found = true;
             }
@@ -135,14 +135,14 @@ impl CommitManager {
 
         println!("Deleting song");
 
-        let mut song = models::song::Song::default();
+        let mut song = icarus_models::song::Song::default();
 
         for arg in &self.ica_action.flags {
             let flag = &arg.flag;
             let value = &arg.value;
 
             if flag == "-D" {
-                song.id = Some(value.parse::<i32>().unwrap());
+                song.id = value.parse::<i32>().unwrap();
             }
         }
 
@@ -178,8 +178,8 @@ impl CommitManager {
         println!("Message: {}", token.message);
 
         let mut dwn_loader = syncers::download::Download { api: api.clone() };
-        let mut song = models::song::Song::default();
-        song.id = Some(num);
+        let mut song = icarus_models::song::Song::default();
+        song.id = num;
         let result_fut = dwn_loader.download_song(&token, &song);
         let result = Runtime::new().unwrap().block_on(result_fut);
         match result {
@@ -220,7 +220,7 @@ impl CommitManager {
         match result {
             Ok(o) => {
                 for son in o {
-                    son.print_info();
+                    // son.print_info();
                 }
             }
             Err(er) => {
@@ -315,7 +315,7 @@ impl CommitManager {
         }
 
         let mut cover_art = models::song::CoverArt::default();
-        let mut song = models::song::Song::default();
+        let mut song = icarus_models::song::Song::default();
         let mut filenames = Vec::new();
         let mut fp = String::new();
         let mut dir = String::new();
@@ -337,8 +337,8 @@ impl CommitManager {
                         filenames.push(s.clone());
                         fp = s.clone();
                         dir = song_file.parent().unwrap().display().to_string();
-                        song.filename = Some(s.clone());
-                        song.directory = Some(dir.clone());
+                        song.filename = s.clone();
+                        song.directory = dir.clone();
                         self.initialize_disc_and_track(&mut song);
                     }
                     Err(er) => println!("Error: {:?}", er),
@@ -352,12 +352,12 @@ impl CommitManager {
         let album = self.retrieve_metadata(&meta_path);
         let trck = i32::from_str(track_id).unwrap();
         let mut s = album.retrieve_song(trck, 1).unwrap();
-        s.filename = Some(fp);
-        s.directory = Some(dir);
-        s.genre = Some(album.genre.clone());
-        s.year = Some(album.year.clone());
-        s.album = Some(album.title.clone());
-        s.data = Some(s.to_data().unwrap());
+        s.filename = (fp);
+        s.directory = (dir);
+        s.genre = (album.genre.clone());
+        s.year = (album.year.clone());
+        s.album = (album.title.clone());
+        s.data = (s.to_data().unwrap());
 
         cover_art.data = Some(cover_art.to_data().unwrap());
 
@@ -396,7 +396,7 @@ impl CommitManager {
         }
 
         let mut cover_art = models::song::CoverArt::default();
-        let mut songs: Vec<models::song::Song> = Vec::new();
+        let mut songs: Vec<icarus_models::song::Song> = Vec::new();
         let mut filenames: Vec<String> = Vec::new();
         let mut metadatapath: String = String::new();
 
@@ -425,15 +425,15 @@ impl CommitManager {
                     metadatapath = directory_part + "/" + &fname.unwrap();
                 }
                 En::SongFile => {
-                    let mut song = models::song::Song::default();
+                    let mut song = icarus_models::song::Song::default();
                     let fname = self.o_to_string(&file_name);
 
                     match fname {
                         Ok(s) => {
                             filenames.push(s.clone());
-                            song.filename = Some(s.clone());
-                            song.directory = Some(sourcepath.clone());
-                            song.data = Some(song.to_data().unwrap());
+                            song.filename = (s.clone());
+                            song.directory = (sourcepath.clone());
+                            song.data = (song.to_data().unwrap());
                             self.initialize_disc_and_track(&mut song);
                         }
                         Err(er) => println!("Error: {:?}", er),
@@ -460,10 +460,12 @@ impl CommitManager {
         println!("");
 
         for sng in &mut album.songs {
-            match sng.data {
-                Some(_) => {}
-                None => {
-                    sng.data = Some(sng.to_data().unwrap());
+            match sng.to_data() {
+                Ok(data) => {
+                    sng.data = data;
+                }
+                Err(err) => {
+                    return Err(err);
                 }
             };
         }
@@ -499,43 +501,21 @@ impl CommitManager {
         // Apply directory
         for song in &mut album.songs {
             let dir = &song.directory;
-            match dir {
-                Some(s) => println!("{}", s),
-                None => {
-                    song.directory = Some(directory.clone());
-                }
-            }
+                    song.directory = directory.clone();
         }
 
         // Apply filename
         let mut index = 0;
         for song in &mut album.songs {
             let filename = filenames[index].clone();
-            song.filename = Some(filename);
+            song.filename = filename.clone();
             index += 1;
         }
 
         for song in &mut album.songs {
-            match &mut song.album {
-                Some(_) => {}
-                None => {
-                    song.album = Some(album.title.clone());
-                }
-            }
-
-            match &mut song.genre {
-                Some(_) => {}
-                None => {
-                    song.genre = Some(album.genre.clone());
-                }
-            }
-
-            match &mut song.year {
-                Some(_) => {}
-                None => {
-                    song.year = Some(album.year.clone());
-                }
-            }
+                song.album = album.title.clone();
+                    song.genre = (album.genre.clone());
+                    song.year = (album.year.clone());
         }
     }
 
@@ -591,12 +571,11 @@ impl CommitManager {
     // Standards
     // * track01.cdda.wav - Disc 1, Track 1
     // * track02d02.cdda.wav - Disc 2, Track 2
-    fn initialize_disc_and_track(&mut self, song: &mut models::song::Song) {
+    fn initialize_disc_and_track(&mut self, song: &mut icarus_models::song::Song) {
         let mut disc = 1;
         let mut track = 1;
         let mut mode = 0;
-        let filename =
-            &<std::option::Option<std::string::String> as Clone>::clone(&song.filename).unwrap();
+        let filename = &song.filename;
 
         let trd = filename.contains("trackd");
         let tr = filename.contains("track");
@@ -680,11 +659,11 @@ impl CommitManager {
             _ => println!(""),
         }
 
-        song.disc = Some(disc);
-        song.track = Some(track);
+        song.disc = (disc);
+        song.track = (track);
     }
 
-    fn _parse_disc_and_track(&self, song: &mut models::song::Song, track_id: &String) {
+    fn _parse_disc_and_track(&self, song: &mut icarus_models::song::Song, track_id: &String) {
         let sep = |_a: &char, _b: &char| -> bool {
             return false;
         };
@@ -706,11 +685,11 @@ impl CommitManager {
                 d_str.push(c);
             }
 
-            song.disc = Some(d_str.parse::<i32>().unwrap());
-            song.track = Some(t_str.parse::<i32>().unwrap());
+            song.disc = (d_str.parse::<i32>().unwrap());
+            song.track = (t_str.parse::<i32>().unwrap());
         } else {
             if utilities::checks::Checks::is_numeric(track_id) {
-                song.track = Some(track_id.parse::<i32>().unwrap());
+                song.track = (track_id.parse::<i32>().unwrap());
             }
         }
     }
diff --git a/src/models/song.rs b/src/models/song.rs
index aa7700d..089bb91 100644
--- a/src/models/song.rs
+++ b/src/models/song.rs
@@ -3,6 +3,7 @@ use std::io::Read;
 
 use serde::{Deserialize, Serialize};
 
+/*
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Song {
     #[serde(alias = "id")]
@@ -24,6 +25,7 @@ pub struct Song {
     pub data: Option<Vec<u8>>,
     pub directory: Option<String>,
 }
+*/
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Album {
@@ -35,7 +37,7 @@ pub struct Album {
     pub track_count: i32,
     pub disc_count: i32,
     #[serde(alias = "tracks")]
-    pub songs: Vec<Song>,
+    pub songs: Vec<icarus_models::song::Song>,
 }
 
 impl Default for Album {
@@ -52,6 +54,7 @@ impl Default for Album {
     }
 }
 
+/* 
 impl Default for Song {
     fn default() -> Self {
         Song {
@@ -139,6 +142,7 @@ impl Song {
         return serde_json::to_string_pretty(&self);
     }
 }
+*/
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct CoverArt {
diff --git a/src/syncers/delete.rs b/src/syncers/delete.rs
index 0fafe1e..d5eb5e5 100644
--- a/src/syncers/delete.rs
+++ b/src/syncers/delete.rs
@@ -21,8 +21,8 @@ impl Delete {
     pub async fn delete_song(
         &mut self,
         token: &icarus_models::token::AccessToken,
-        song: &models::song::Song,
-    ) -> Result<models::song::Song, std::io::Error> {
+        song: &icarus_models::song::Song,
+    ) -> Result<icarus_models::song::Song, std::io::Error> {
         self.api.endpoint = "song/data/delete".to_owned();
         let url = self.retrieve_url(&song);
         let client = reqwest::Client::builder().build().unwrap();
@@ -33,12 +33,12 @@ impl Delete {
             .send()
             .await
             .unwrap();
-        let mut sng = models::song::Song::default();
+        let mut sng = icarus_models::song::Song::default();
 
         match response.status() {
             reqwest::StatusCode::OK => {
                 println!("Success!");
-                let s = response.json::<models::song::Song>().await;
+                let s = response.json::<icarus_models::song::Song>().await;
                 match s {
                     //
                     Ok(parsed) => {
@@ -57,7 +57,7 @@ impl Delete {
         return Ok(sng);
     }
 
-    fn retrieve_url(&self, song: &models::song::Song) -> String {
+    fn retrieve_url(&self, song: &icarus_models::song::Song) -> String {
         let api = &self.api;
         let mut url: String = String::from(&api.url);
         url += &String::from("api/");
@@ -65,7 +65,7 @@ impl Delete {
         url += &String::from("/");
         url += &String::from(&api.endpoint);
         url += &String::from("/");
-        url += &song.id.unwrap().to_string();
+        url += &song.id.to_string();
 
         return url;
     }
diff --git a/src/syncers/download.rs b/src/syncers/download.rs
index d0a008e..5752c28 100644
--- a/src/syncers/download.rs
+++ b/src/syncers/download.rs
@@ -24,7 +24,7 @@ impl Download {
     pub async fn download_song(
         &mut self,
         token: &icarus_models::token::AccessToken,
-        song: &models::song::Song,
+        song: &icarus_models::song::Song,
     ) -> Result<String, MyError> {
         self.api.endpoint = String::from("song/data/download");
         let url = self.retrieve_url(&song);
@@ -67,7 +67,7 @@ impl Download {
         return Err(MyError::Other(String::from("Error downloading")));
     }
 
-    fn retrieve_url(&self, song: &models::song::Song) -> String {
+    fn retrieve_url(&self, song: &icarus_models::song::Song) -> String {
         let api = &self.api;
         let mut url: String = String::from(&api.url);
         url += &String::from("api/");
@@ -75,7 +75,7 @@ impl Download {
         url += &String::from("/");
         url += &String::from(&api.endpoint);
         url += &String::from("/");
-        url += &song.id.unwrap().to_string();
+        url += &song.id.to_string();
 
         return url;
     }
diff --git a/src/syncers/retrieve_records.rs b/src/syncers/retrieve_records.rs
index cf482e4..d2e397f 100644
--- a/src/syncers/retrieve_records.rs
+++ b/src/syncers/retrieve_records.rs
@@ -19,9 +19,9 @@ impl RetrieveRecords {
     pub async fn get_all_songs(
         &mut self,
         token: &icarus_models::token::AccessToken,
-    ) -> Result<Vec<models::song::Song>, Error> {
+    ) -> Result<Vec<icarus_models::song::Song>, Error> {
         self.api.endpoint = String::from("song");
-        let mut songs: Vec<models::song::Song> = Vec::new();
+        let mut songs: Vec<icarus_models::song::Song> = Vec::new();
         let url = self.retrieve_url();
         let access_token = token.bearer_token();
 
@@ -46,7 +46,7 @@ impl RetrieveRecords {
         match response.status() {
             reqwest::StatusCode::OK => {
                 // on success, parse our JSON to an APIResponse
-                let s = response.json::<Vec<models::song::Song>>().await;
+                let s = response.json::<Vec<icarus_models::song::Song>>().await;
                 match s {
                     //
                     Ok(parsed) => {
diff --git a/src/syncers/upload.rs b/src/syncers/upload.rs
index c4cf978..36a281c 100644
--- a/src/syncers/upload.rs
+++ b/src/syncers/upload.rs
@@ -47,14 +47,21 @@ impl Upload {
     pub async fn upload_song_with_metadata(
         &mut self,
         token: &icarus_models::token::AccessToken,
-        song: &models::song::Song,
+        song: &icarus_models::song::Song,
         cover: &models::song::CoverArt,
         album: &models::song::Album,
     ) -> Result<reqwest::Response, std::io::Error> {
         self.api.endpoint = String::from("song/data/upload/with/data");
         let url = self.retrieve_url();
         let mut new_song = self.initialize_song(&song, &album);
-        new_song.songpath = song.song_path();
+        match song.song_path() {
+            Ok(p) => {
+        new_song.songpath = p;
+            }
+            Err(er) => {
+                return Err(std::io::Error::new(std::io::ErrorKind::Other, "Error with song path"));
+            }
+        }
         let access_token = token.bearer_token();
 
         if url.is_empty() {
@@ -172,21 +179,22 @@ impl Upload {
         return url;
     }
 
-    fn initialize_song(&self, song: &models::song::Song, album: &models::song::Album) -> Song {
-        let dur = song.duration.clone().unwrap();
+    fn initialize_song(&self, song: &icarus_models::song::Song, album: &models::song::Album) -> Song {
+        let dur = song.duration.clone();
         println!("Duration: {}", dur);
 
         return Song {
-            title: String::from(&song.title.clone().unwrap()),
+            title: String::from(&song.title.clone()),
             album: album.title.clone(),
-            artist: String::from(&song.artist.clone().unwrap().clone()),
+            artist: String::from(&song.artist.clone().clone()),
             album_artist: album.album_artist.clone(),
             year: album.year.clone(),
             genre: album.genre.clone(),
-            duration: f64::round(dur) as i32,
-            track: (song.track.clone().unwrap()),
+            // duration: f64::round(dur) as i32,
+            duration: dur,
+            track: (song.track.clone()),
             track_count: album.track_count.clone(),
-            disc: song.disc.clone().unwrap(),
+            disc: song.disc.clone(),
             disc_count: album.disc_count.clone(),
             songpath: String::new(),
         };