diff --git a/WpfDemoApp/App.config b/WpfDemoApp/App.config
deleted file mode 100644
index b50c74f..0000000
--- a/WpfDemoApp/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/WpfDemoApp/App.xaml b/WpfDemoApp/App.xaml
index 63ff4ca..a786df8 100644
--- a/WpfDemoApp/App.xaml
+++ b/WpfDemoApp/App.xaml
@@ -1,5 +1,5 @@
 <Application x:Class="WpfDemoApp.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
-</Application>
+             StartupUri="Views/MainWindow.xaml">
+</Application>
\ No newline at end of file
diff --git a/WpfDemoApp/InformationWindow.xaml b/WpfDemoApp/InformationWindow.xaml
deleted file mode 100644
index d0bc947..0000000
--- a/WpfDemoApp/InformationWindow.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Window x:Class="WpfDemoApp.InformationWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="{Binding Title}" Height="400" Width="400"
-        WindowStartupLocation="CenterOwner">
-    <Grid>
-        <TextBox IsReadOnly="True" VerticalScrollBarVisibility="Auto" Text="{Binding Mode=OneWay}"/>
-    </Grid>
-</Window>
diff --git a/WpfDemoApp/MainWindow.xaml b/WpfDemoApp/MainWindow.xaml
deleted file mode 100644
index 28fe247..0000000
--- a/WpfDemoApp/MainWindow.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Window x:Class="WpfDemoApp.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="YoutubeDLSharp" SizeToContent="Height" Width="400" ResizeMode="CanMinimize">
-    <Window.Resources>
-        <Style TargetType="Button">
-            <Setter Property="Padding" Value="4"/>
-        </Style>
-    </Window.Resources>
-    <DockPanel>
-        <StatusBar DockPanel.Dock="Bottom">
-            <StatusBarItem ContentStringFormat="yt-dlp Version: {0}"
-                           Content="{Binding YoutubeDL.Version, Mode=OneWay}"/>
-        </StatusBar>
-        <Grid Margin="4">
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <TextBox x:Name="txtUrl" Margin="0,12" FontSize="14"/>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*"/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <CheckBox VerticalAlignment="Center" HorizontalAlignment="Center"
-                          Content="Audio Only"
-                          IsChecked="{Binding AudioOnly}"/>
-                <Button Grid.Column="1" IsEnabled="{Binding IsNotDownloading, Mode=OneWay}"
-                        Content="Download" Click="DownloadButton_Click"/>
-                <Button Grid.Column="2" IsEnabled="{Binding IsNotDownloading, Mode=OneWay}"
-                        Content="Information" Click="InformationButton_Click"/>
-            </Grid>
-            <Expander Grid.Row="2" Header="Custom Arguments">
-                <TextBox x:Name="txtOptions" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Height="60"/>
-            </Expander>
-            <StackPanel Grid.Row="3" Margin="0,12">
-                <ProgressBar x:Name="progDownload" Height="20" Margin="0"
-                             Maximum="1"/>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock x:Name="txtState" Margin="0,0,8,0"/>
-                    <TextBlock x:Name="txtProgress" Text="speed:  | left:"/>
-                </StackPanel>
-            </StackPanel>
-            <TextBox x:Name="txtOutput" Grid.Row="4" IsReadOnly="True"
-                     Height="100" VerticalScrollBarVisibility="Visible"/>
-        </Grid>
-    </DockPanel>
-</Window>
diff --git a/WpfDemoApp/MainWindow.xaml.cs b/WpfDemoApp/MainWindow.xaml.cs
deleted file mode 100644
index 4813378..0000000
--- a/WpfDemoApp/MainWindow.xaml.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Windows;
-using YoutubeDLSharp;
-using YoutubeDLSharp.Metadata;
-using YoutubeDLSharp.Options;
-
-namespace WpfDemoApp
-{
-    public partial class MainWindow : Window, INotifyPropertyChanged
-    {
-        private bool isNotDownloading = true;
-        private bool audioOnly = false;
-
-        private IProgress<DownloadProgress> progress;
-        private IProgress<string> output;
-
-        public MainWindow()
-        {
-            this.YoutubeDL = new YoutubeDL() { YoutubeDLPath = "yt-dlp.exe" };
-            this.DataContext = this;
-            InitializeComponent();
-            progress = new Progress<DownloadProgress>((p) => showProgress(p));
-            output = new Progress<string>((s) => txtOutput.AppendText(s + Environment.NewLine));
-        }
-
-        public YoutubeDL YoutubeDL { get; }
-
-        public bool IsNotDownloading
-        {
-            get => isNotDownloading;
-            set
-            {
-                isNotDownloading = value;
-                propertyChanged();
-            }
-        }
-
-        public bool AudioOnly
-        {
-            get => audioOnly;
-            set
-            {
-                audioOnly = value;
-                propertyChanged();
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void propertyChanged([CallerMemberName] string property = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
-        }
-
-        private async void DownloadButton_Click(object sender, RoutedEventArgs e)
-        {
-            string url = txtUrl.Text;
-            IsNotDownloading = false;
-            txtOutput.Clear();
-            // Parse custom arguments
-            OptionSet custom = OptionSet.FromString(txtOptions.Text.Split('\n'));
-            RunResult<string> result;
-            if (AudioOnly)
-            {
-                result = await YoutubeDL.RunAudioDownload(
-                    url, AudioConversionFormat.Mp3, progress: progress,
-                    output: output, overrideOptions: custom
-                );
-            }
-            else
-            {
-                result = await YoutubeDL.RunVideoDownload(url, progress: progress, output: output, overrideOptions: custom);
-            }
-            if (result.Success)
-            {
-                MessageBox.Show($"Successfully downloaded \"{url}\" to:\n\"{result.Data}\".", "YoutubeDLSharp");
-            }
-            else showErrorMessage(url, String.Join("\n", result.ErrorOutput));
-            IsNotDownloading = true;
-        }
-
-        private void showProgress(DownloadProgress p)
-        {
-            txtState.Text = p.State.ToString();
-            progDownload.Value = p.Progress;
-            txtProgress.Text = $"speed: {p.DownloadSpeed} | left: {p.ETA}";
-        }
-
-        private async void InformationButton_Click(object sender, RoutedEventArgs e)
-        {
-            string url = txtUrl.Text;
-            RunResult<VideoData> result = await YoutubeDL.RunVideoDataFetch(url);
-            if (result.Success)
-            {
-                var infoWindow = new InformationWindow(result.Data);
-                infoWindow.ShowDialog();
-            }
-            else showErrorMessage(url, String.Join("\n", result.ErrorOutput));
-        }
-
-        private void showErrorMessage(string url, string error)
-            => MessageBox.Show($"Failed to process '{url}'. Output:\n\n{error}", "YoutubeDLSharp - ERROR",
-                MessageBoxButton.OK, MessageBoxImage.Error);
-    }
-}
diff --git a/WpfDemoApp/ViewModels/MainWindowViewModel.cs b/WpfDemoApp/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 0000000..f376eb4
--- /dev/null
+++ b/WpfDemoApp/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,110 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System.Windows;
+using WpfDemoApp.Views;
+using YoutubeDLSharp;
+using YoutubeDLSharp.Options;
+
+namespace WpfDemoApp.ViewModels
+{
+    public partial class MainWindowViewModel : ObservableObject
+    {
+        private YoutubeDL _youtubeDL = new();
+        private IProgress<DownloadProgress> _progress;
+        private IProgress<string> _output;
+
+        [ObservableProperty]
+        private bool _audioOnly = false;
+
+        [ObservableProperty]
+        private string _url = "";
+
+        [ObservableProperty]
+        private string _options = "";
+
+        [ObservableProperty]
+        private string _state = "";
+
+        [ObservableProperty]
+        private float _progressValue = 0;
+
+        [ObservableProperty]
+        private string _progressText = "";
+
+        [ObservableProperty]
+        private string _outputText = "";
+
+        public string Version => _youtubeDL.Version;
+
+        public MainWindowViewModel()
+        {
+            _progress = new Progress<DownloadProgress>(ShowDownloadProgress);
+            _output = new Progress<string>(ShowDownloadOutput);
+        }
+
+        [RelayCommand]
+        private async Task Download()
+        {
+            await YoutubeDLSharp.Utils.DownloadBinaries();
+
+            RunResult<string> result;
+
+            var options = Options.Split('\n');
+            var custom = OptionSet.FromString(options);
+            // it seems like yt-dlp doesn't output progress bar by default
+            custom.Progress = true;
+
+            OutputText = "";
+            if (AudioOnly)
+            {
+                result = await _youtubeDL.RunAudioDownload(Url, AudioConversionFormat.Mp3, progress: _progress, output: _output, overrideOptions: custom);
+            }
+            else
+            {
+                result = await _youtubeDL.RunVideoDownload(Url, progress: _progress, output: _output, overrideOptions: custom);
+            }
+
+            if (result.Success)
+            {
+                MessageBox.Show($"Successfully downloaded \"{Url}\" to:\n\"{result.Data}\".", "YoutubeDLSharp");
+            }
+            else
+            {
+                ShowErrorMessage(Url, string.Join("\n", result.ErrorOutput));
+            }
+        }
+
+        [RelayCommand]
+        private async Task FetchInfo()
+        {
+            await YoutubeDLSharp.Utils.DownloadBinaries();
+
+            var result = await _youtubeDL.RunVideoDataFetch(Url);
+            if (result.Success)
+            {
+                // doesn't follow MVVM pattern but project simple enough to use this trick
+                var informationWindow = new InformationWindow(result.Data);
+                informationWindow.ShowDialog();
+            }
+            else ShowErrorMessage(Url, string.Join("\n", result.ErrorOutput));
+        }
+
+        private void ShowDownloadProgress(DownloadProgress progress)
+        {
+            State = progress.State.ToString();
+            ProgressValue = progress.Progress;
+            ProgressText = $"speed: {progress.DownloadSpeed} | left: {progress.ETA}";
+        }
+
+        private void ShowDownloadOutput(string str)
+        {
+            if (str.Contains("[download]")) return;
+
+            OutputText += (str + Environment.NewLine);
+        }
+
+        private void ShowErrorMessage(string url, string error)
+            => MessageBox.Show($"Failed to process '{url}'. Output:\n\n{error}", "YoutubeDLSharp - ERROR",
+                MessageBoxButton.OK, MessageBoxImage.Error);
+    }
+}
\ No newline at end of file
diff --git a/WpfDemoApp/Views/InformationWindow.xaml b/WpfDemoApp/Views/InformationWindow.xaml
new file mode 100644
index 0000000..32d5346
--- /dev/null
+++ b/WpfDemoApp/Views/InformationWindow.xaml
@@ -0,0 +1,15 @@
+<Window
+    x:Class="WpfDemoApp.Views.InformationWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:metadata="clr-namespace:YoutubeDLSharp.Metadata;assembly=YoutubeDLSharp"
+    mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=metadata:VideoData}"
+    Title="{Binding Title}" Height="400" Width="400"
+    WindowStartupLocation="CenterOwner">
+    <Grid>
+        <TextBox IsReadOnly="True" VerticalScrollBarVisibility="Auto" Text="{Binding Mode=OneWay}" />
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/WpfDemoApp/InformationWindow.xaml.cs b/WpfDemoApp/Views/InformationWindow.xaml.cs
similarity index 66%
rename from WpfDemoApp/InformationWindow.xaml.cs
rename to WpfDemoApp/Views/InformationWindow.xaml.cs
index 3533123..b682d21 100644
--- a/WpfDemoApp/InformationWindow.xaml.cs
+++ b/WpfDemoApp/Views/InformationWindow.xaml.cs
@@ -1,15 +1,14 @@
-using System;
-using System.Windows;
+using System.Windows;
 using YoutubeDLSharp.Metadata;
 
-namespace WpfDemoApp
+namespace WpfDemoApp.Views
 {
     public partial class InformationWindow : Window
     {
         public InformationWindow(VideoData videoData)
         {
-            this.DataContext = videoData;
             InitializeComponent();
+            DataContext = videoData;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/WpfDemoApp/Views/MainWindow.xaml b/WpfDemoApp/Views/MainWindow.xaml
new file mode 100644
index 0000000..74e2ab4
--- /dev/null
+++ b/WpfDemoApp/Views/MainWindow.xaml
@@ -0,0 +1,59 @@
+<Window
+    x:Class="WpfDemoApp.Views.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vms="clr-namespace:WpfDemoApp.ViewModels"
+    mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=vms:MainWindowViewModel}"
+    Title="YoutubeDLSharp" SizeToContent="Height" Width="400" ResizeMode="CanMinimize">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="Padding" Value="4" />
+        </Style>
+    </Window.Resources>
+    <DockPanel>
+        <StatusBar DockPanel.Dock="Bottom">
+            <StatusBarItem ContentStringFormat="yt-dlp Version: {0}"
+                           Content="{Binding Version, Mode=OneWay}" />
+        </StatusBar>
+        <Grid Margin="4">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <TextBox Text="{Binding Url}"  Margin="0,12" FontSize="14" />
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <CheckBox VerticalAlignment="Center" HorizontalAlignment="Center"
+                          Content="Audio Only"
+                          IsChecked="{Binding AudioOnly}" />
+                <Button Grid.Column="1" Command="{Binding DownloadCommand}"
+                        Content="Download" />
+                <Button Grid.Column="2" Command="{Binding FetchInfoCommand}"
+                        Content="Information" />
+            </Grid>
+            <Expander Grid.Row="2" Header="Custom Arguments">
+                <TextBox AcceptsReturn="True" Text="{Binding Options}" VerticalScrollBarVisibility="Auto" Height="60" />
+            </Expander>
+            <StackPanel Grid.Row="3" Margin="0,12">
+                <ProgressBar Value="{Binding ProgressValue}" Height="20" Margin="0"
+                             Maximum="1" />
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="{Binding State}" Margin="0,0,8,0" />
+                    <TextBlock Text="{Binding ProgressText}" />
+                </StackPanel>
+            </StackPanel>
+            <TextBox Text="{Binding OutputText, Mode=OneWay}" Grid.Row="4" IsReadOnly="True"
+                     Height="100" VerticalScrollBarVisibility="Visible" />
+        </Grid>
+    </DockPanel>
+</Window>
\ No newline at end of file
diff --git a/WpfDemoApp/Views/MainWindow.xaml.cs b/WpfDemoApp/Views/MainWindow.xaml.cs
new file mode 100644
index 0000000..b452ef8
--- /dev/null
+++ b/WpfDemoApp/Views/MainWindow.xaml.cs
@@ -0,0 +1,14 @@
+using System.Windows;
+using WpfDemoApp.ViewModels;
+
+namespace WpfDemoApp.Views
+{
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            DataContext = new MainWindowViewModel();
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/WpfDemoApp/WpfDemoApp.csproj b/WpfDemoApp/WpfDemoApp.csproj
index 3f6f6ba..1611edc 100644
--- a/WpfDemoApp/WpfDemoApp.csproj
+++ b/WpfDemoApp/WpfDemoApp.csproj
@@ -1,17 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\YoutubeDLSharp\YoutubeDLSharp.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file