diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/__init__.py b/YouTubeMDBot/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/__main__.py b/YouTubeMDBot/__main__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/api/__init__.py b/YouTubeMDBot/api/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/api/youtube_api.py b/YouTubeMDBot/api/youtube_api.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/audio/__init__.py b/YouTubeMDBot/audio/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/audio/fpcalc.py b/YouTubeMDBot/audio/fpcalc.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/bot.py b/YouTubeMDBot/bot.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/commands/StartHandler.py b/YouTubeMDBot/commands/StartHandler.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/commands/__init__.py b/YouTubeMDBot/commands/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/constants/__init__.py b/YouTubeMDBot/constants/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/constants/app_constants.py b/YouTubeMDBot/constants/app_constants.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/decorators/__init__.py b/YouTubeMDBot/decorators/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/decorators/decorators.py b/YouTubeMDBot/decorators/decorators.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/downloader/__init__.py b/YouTubeMDBot/downloader/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/downloader/youtube_downloader.py b/YouTubeMDBot/downloader/youtube_downloader.py
old mode 100644
new mode 100755
index 6139205..dfbb934
--- a/YouTubeMDBot/downloader/youtube_downloader.py
+++ b/YouTubeMDBot/downloader/youtube_downloader.py
@@ -17,6 +17,7 @@
 from typing import Tuple
 
 from ..constants.app_constants import YDL_CLI_OPTIONS
+from ..audio.ffmpeg import FFmpegOpener
 
 
 class YouTubeDownloader(object):
@@ -25,7 +26,7 @@ def __init__(self, url: str):
         self.__options: list = YDL_CLI_OPTIONS.copy()
         self.__options.append(self.__url)
 
-    def download(self) -> Tuple[BytesIO, bytes]:
+    def download(self, ffmpeg: bool = False) -> Tuple[BytesIO, bytes]:
         import subprocess
 
         proc = subprocess.Popen(self.__options,
@@ -34,6 +35,13 @@ def download(self) -> Tuple[BytesIO, bytes]:
         stdout, stderr = proc.communicate()
         retcode = proc.returncode
         if retcode == 0:
+            # if ffmpeg:
+            #    opener = FFmpegOpener(stdout)
+            #     opener.open()
+            #     stdout = opener.get_output()
+            #     err = opener.get_extra()
+            #     if err:
+            #         print(err.decode("utf-8"))
             return BytesIO(stdout), stdout
         else:
             raise RuntimeError("youtube-dl downloader exception - more info: " +
diff --git a/YouTubeMDBot/errors/EmptyBodyError.py b/YouTubeMDBot/errors/EmptyBodyError.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/errors/InvalidCredentialsError.py b/YouTubeMDBot/errors/InvalidCredentialsError.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/errors/NoMatchError.py b/YouTubeMDBot/errors/NoMatchError.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/errors/__init__.py b/YouTubeMDBot/errors/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/logging_utils/__init__.py b/YouTubeMDBot/logging_utils/__init__.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/logging_utils/utils.py b/YouTubeMDBot/logging_utils/utils.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/requirements.txt b/YouTubeMDBot/requirements.txt
old mode 100644
new mode 100755
index d00dddf..e341c34
--- a/YouTubeMDBot/requirements.txt
+++ b/YouTubeMDBot/requirements.txt
@@ -1,3 +1,4 @@
+mutagen
 isodate
 google-api-python-client
 musicbrainzngs
diff --git a/YouTubeMDBot/tests/downloader.py b/YouTubeMDBot/tests/downloader.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/tests/song_search.py b/YouTubeMDBot/tests/song_search.py
old mode 100644
new mode 100755
diff --git a/YouTubeMDBot/utils/__init__.py b/YouTubeMDBot/utils/__init__.py
old mode 100644
new mode 100755
index d12bbb3..1315c64
--- a/YouTubeMDBot/utils/__init__.py
+++ b/YouTubeMDBot/utils/__init__.py
@@ -14,3 +14,4 @@
 #     You should have received a copy of the GNU General Public License
 #    along with this program. If not, see <http://www.gnu.org/licenses/>.
 from ..utils import youtube_utils
+from ..utils.timeout import timeout
diff --git a/YouTubeMDBot/utils/youtube_utils.py b/YouTubeMDBot/utils/youtube_utils.py
old mode 100644
new mode 100755