diff --git a/index.js b/index.js
index 10f4784..b93deca 100644
--- a/index.js
+++ b/index.js
@@ -48,50 +48,276 @@ const player = {
     { id: 5, name: 'Israeli', songs: [4, 5] },
   ],
   playSong(song) {
-    console.log(/* your code here */)
+    console.log(
+      "Playing " + song.title 
+      +" from " + song.album 
+      + " by " + song.artist 
+      + " | " 
+      + durationFormat(song.duration) 
+      +".")
   },
 }
 
+// creating a function that returns a song duration in the required format
+function durationFormat(duration){
+  let minutes = Math.floor(duration / 60);
+  let seconds = duration % 60;
+  if(minutes < 10 && seconds < 10)
+    return "0"+minutes+":"+"0"+seconds;
+
+    else if (minutes < 10) return "0"+minutes+":"+seconds;
+         else if (seconds < 10) return minutes+":0"+seconds;
+              else return minutes+":"+seconds;
+
+
+}
+
+
 function playSong(id) {
-  // your code here
+
+  if (!(checkId(player.songs,id))) throw "ERROR: id doesn't exict.";
+  else for(let i = 0 ; i < player.songs.length ; i ++){
+    if (player.songs[i].id === id)
+      return player.playSong(player.songs[i]);
+  }
+  
+}
+
+// adding a function that checks if there is an id matching
+function checkId(songs,id){
+  for (let i = 0 ; i < songs.length ; i ++){
+    if (id === songs[i].id)
+      return true;
+  }
+  return false;
 }
 
+
 function removeSong(id) {
-  // your code here
+  if (!checkId(player.songs, id)){
+    throw "ID doesn't exist."
+  }
+ 
+  
+  for (let i = 0 ; i < player.songs.length ; i ++){
+      if(player.songs[i].id === id ){
+        player.songs.splice(i,1);
+      }
+  }
+
+  for (let j = 0 ; j < player.playlists.length ; j ++){
+for (let x = 0; x < player.playlists[j].songs.length; x++) {
+    if(player.playlists[j].songs[x] === id){
+      player.playlists[j].songs.splice(x,1);
+    }
+  
+  
 }
 
-function addSong(title, album, artist, duration, id) {
-  // your code here
+  }
+  
 }
 
+
+// adding a function that returns a new id
+function newId(arr){
+  let max = arr[0];
+  for (let i = 0; i < arr.length; i++) {
+    if (max < arr[i].id)
+    max = arr[i].id;   
+  }
+    return max+1;
+}
+
+// adding a function that takes the duration in a mm:ss format and turns it to seconds
+function oppDuration(duration){
+  duration = duration.split(':')
+  let minutes = parseInt(duration[0]) * 60
+  let seconds = parseInt(duration[1])
+  return minutes + seconds
+}
+
+function addSong(title, album, artist, duration, id = newId(player.songs)) {
+ if (checkId(player.songs, id)){
+   throw "ID already Exist."
+ }
+
+ duration= oppDuration(duration);
+
+ player.songs.push({title,album,artist,duration,id});
+ return id;
+}
+
+
 function removePlaylist(id) {
-  // your code here
+  if (!checkId(player.playlists, id)){
+    throw "ID doesn't exist."
+  }
+  for (let i = 0; i < player.playlists.length; i++) {
+    if (player.playlists[i].id === id)
+        player.playlists.splice(i,1);
+       
+  }
 }
 
-function createPlaylist(name, id) {
-  // your code here
+
+function createPlaylist(name, id = newId(player.playlists)) {
+  if (checkId(player.playlists, id)){
+    throw "ID already exist."}
+
+    player.playlists.push({name, id, songs: []});
+    return id;
+
+  
 }
 
+
 function playPlaylist(id) {
-  // your code here
+  if (!checkId(player.playlists, id)){
+    throw "ID doesn't exist."}
+
+    for (let i = 0; i < player.playlists.length; i++) {
+      if(id === player.playlists[i].id){
+          for (let x = 0; x < player.playlists[i].songs.length; x++) {
+              playSong(player.playlists[i].songs[x]);
+          }
+      }
+    }
+    return id;
 }
 
 function editPlaylist(playlistId, songId) {
-  // your code here
+  if (!checkId(player.playlists, playlistId)){
+    throw "ID of the playlist doesn't exist."}
+
+  if (!checkId(player.songs, songId))
+    throw "ID of the song doesn't exist."
+
+    for (let i = 0; i < player.playlists.length; i++) {
+      if (playlistId === player.playlists[i].id){
+        for (let x = 0; x < player.playlists[i].songs.length; x++) {
+          if (songId === player.playlists[i].songs[x]){
+              player.playlists[i].songs.splice(x,1);
+              }
+            else 
+                    player.playlists[i].songs.push(songId);
 }
+            if (player.playlists[i].songs.length === 0)
+               removePlaylist(player.playlists[i].id);
+            
+          }
+        }
+      }
+    
+
 
 function playlistDuration(id) {
-  // your code here
+
+  let correctPlaylist = findPlaylistById(id) //correctPlaylist contain the wanted playlist
+  let save = 0,
+    sum = 0
+  for (let i = 0; i < correctPlaylist.songs.length; i++) {
+    //run on the songs array inside this playlist
+    save = correctPlaylist.songs[i]
+    for (let j = 0; j < player.songs.length; j++) {
+      //run on the songs array
+      if (player.songs[j].id === save) sum += player.songs[j].duration
+    }
+  }
+  return sum
+}
+// added a function that returns the right playlist.
+
+function findPlaylistById(id) {
+  //Get a playlist id and return the wanted playlist by his id
+  let correctPlaylist
+  for (let i = 0; i < player.playlists.length; i++) {
+    //run on playlists array
+    if (id === player.playlists[i].id) correctPlaylist = player.playlists[i]
+  }
+  return correctPlaylist
 }
 
+
 function searchByQuery(query) {
-  // your code here
+  let tempQuery = query.toUpperCase()
+  const results = { songs: [], playlists: [] }
+  for (let i = 0; i < player.playlists.length; i++) {
+    //for playlists
+    if (player.playlists[i].name.toUpperCase().includes(tempQuery)) {
+      results.playlists.push(player.playlists[i])
+      results.playlists.sort((a, b) => {
+        if (a.name.toUpperCase() < b.name.toUpperCase()) return -1
+      })
+    }
+  }
+  for (let i = 0; i < player.songs.length; i++) {
+    //for songs
+    if (
+      player.songs[i].album.toUpperCase().includes(tempQuery) ||
+      player.songs[i].artist.toUpperCase().includes(tempQuery) ||
+      player.songs[i].title.toUpperCase().includes(tempQuery)
+    ) {
+      results.songs.push(player.songs[i])
+      results.songs.sort((a, b) => {
+        if (a.title.toUpperCase() < b.title.toUpperCase()) return -1
+      })
+    }
+  }
+  return results
 }
 
+
 function searchByDuration(duration) {
-  // your code here
+  duration = oppDuration(duration) //convert from mm:ss format to seconds
+  let arrSongs = arrLengthSongs(duration) //arrSongs contain array that look like this: [ closest-duartion-for-song , the-object-himself(song) ]
+  let arrPlaylist = arrLengthPlaylist(duration) //arrPlaylist contain array that look like this: [ closest-duartion-for-playlist , the-object-himself(playlist) ]
+  return arrSongs[0] < arrPlaylist[0] ? arrSongs[1] : arrPlaylist[1]
+}
+
+function arrLengthSongs(duration) {
+  //gets song duartion return array of [closet-duration-song-in-seconds , closet-duration-song-the-object-himself(song)]
+  let arr = []
+  let minDuration = duration,
+    index = 0
+  for (let i = 0; i < player.songs.length; i++) {
+    //run on the songs array
+    if (minDuration > Math.abs(duration - player.songs[i].duration)) {
+      minDuration = Math.abs(duration - player.songs[i].duration)
+      index = i
+    }
+  }
+  arr.push(minDuration)
+  arr.push(player.songs[index])
+  return arr
 }
 
+function arrLengthPlaylist(duration) {
+  //gets playlist duartion return array of [closet-duration-playlist-in-seconds , closet-duration-playlist-the-object-himself(playlist)]
+  let arr = []
+  let minDuration = duration,
+    index = 0
+  for (let i = 0; i < player.playlists.length; i++) {
+    //run on playlists array
+    if (
+      minDuration >
+      Math.abs(duration - playlistDuration(player.playlists[i].id))
+    ) {
+      minDuration = Math.abs(
+        duration - playlistDuration(player.playlists[i].id)
+      )
+      index = i
+    }
+  }
+  arr.push(minDuration)
+  arr.push(player.playlists[index])
+  return arr
+}
+
+
+
+// do not change below this line
+
 module.exports = {
   player,
   playSong,