diff --git a/SmokeyVersionSwitcher/Downloader.cs b/SmokeyVersionSwitcher/Downloader.cs
index f079a88..c39b932 100644
--- a/SmokeyVersionSwitcher/Downloader.cs
+++ b/SmokeyVersionSwitcher/Downloader.cs
@@ -93,13 +93,7 @@ public void EnableUserAuthorization()
 
         public async Task Download(string updateIdentity, string revisionNumber, string destination, DownloadProgress progress, CancellationToken cancellationToken)
         {
-            string link = await GetDownloadUrl(updateIdentity, revisionNumber);
-
-            if (link == null)
-            {
-                throw new BadUpdateIdentityException();
-            }
-
+            string link = await GetDownloadUrl(updateIdentity, revisionNumber) ?? throw new BadUpdateIdentityException();
             Debug.WriteLine("Resolved download link: " + link);
             await DownloadFile(link, destination, progress, cancellationToken);
         }
diff --git a/SmokeyVersionSwitcher/MainWindow.xaml b/SmokeyVersionSwitcher/MainWindow.xaml
index 5cf8ba7..16ec29f 100644
--- a/SmokeyVersionSwitcher/MainWindow.xaml
+++ b/SmokeyVersionSwitcher/MainWindow.xaml
@@ -7,6 +7,10 @@
         mc:Ignorable="d"
         Title="SmokeyStack's Version Switcher" Height="800" Width="800">
     <Window.Resources>
+        <CollectionViewSource x:Key="versionListRelease" IsLiveFilteringRequested="True" />
+        <CollectionViewSource x:Key="versionListBeta" IsLiveFilteringRequested="True" />
+        <CollectionViewSource x:Key="versionListPreview" IsLiveFilteringRequested="True" />
+        <CollectionViewSource x:Key="versionListInstalled" IsLiveFilteringRequested="True" />
         <DataTemplate x:Key="templateVersionNotInstalled" DataType="{x:Type local:Version}">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -102,7 +106,7 @@
         <Menu Grid.Row="0" IsMainMenu="True" Background="Transparent">
             <MenuItem Header="_File">
                 <MenuItem Header="Open log file" Click="MenuItemOpenLogFileClicked" />
-                <MenuItem Header="Open launcher data folder in Explorer" Click="MenuItemOpenDataDirClicked"/>
+                <MenuItem Header="Open launcher data folder in Explorer" Click="MenuItemOpenDataDirectoryClicked"/>
             </MenuItem>
             <MenuItem Header="_Options">
                 <MenuItem Header="Refresh version list" Name="RefreshVersionList" Click="MenuItemRefreshVersionListClicked" />
@@ -111,7 +115,7 @@
         <TabControl Grid.Row="1" Margin="0,5,0,0" BorderThickness="0,1,0,0" Padding="0" Width="Auto">
             <TabItem Header="Play">
                 <Grid>
-                    <ComboBox x:Name="InstalledList" ItemsSource="{Binding}" Width="200" HorizontalAlignment="Left" Height="50" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="25,0">
+                    <ComboBox x:Name="VersionListInstalled" ItemsSource="{Binding}" Width="200" HorizontalAlignment="Left" Height="50" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="25,0">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock>
@@ -125,12 +129,18 @@
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
-                    <Button Content="Play" Height="75" Width="300" Click="Launch" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <Button Content="Play" Height="75" Width="300" Click="InvokeLaunch" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     <TextBlock x:Name="TextTest" Text="{Binding}" Margin="25,0" Width="200" Height="50" VerticalAlignment="Center" HorizontalAlignment="Right" FontSize="18" TextAlignment="Center" />
                 </Grid>
             </TabItem>
-            <TabItem Header="Installations">
-                <ContentControl x:Name="VersionList" Template="{StaticResource templateVersionList}" Margin="5" />
+            <TabItem Header="Release">
+                <ContentControl x:Name="VersionListRelease" d:DataContext="{d:DesignData /SampleData/Versions.xaml}" Template="{StaticResource templateVersionList}" Margin="5" />
+            </TabItem>
+            <TabItem Header="Beta">
+                <ContentControl x:Name="VersionListBeta" d:DataContext="{d:DesignData /SampleData/Versions.xaml}" Template="{StaticResource templateVersionList}" Margin="5" />
+            </TabItem>
+            <TabItem Header="Preview">
+                <ContentControl x:Name="VersionListPreview" d:DataContext="{d:DesignData /SampleData/Versions.xaml}" Template="{StaticResource templateVersionList}" Margin="5" />
             </TabItem>
         </TabControl>
         <Grid Grid.Row="2" VerticalAlignment="Center" Margin="5,5,5,10">
@@ -139,7 +149,7 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Label Grid.Row="0" Grid.Column="0" Name="VersionLoadingProgressLabel" Content="" Padding="0,0,0,0"/>
+            <CheckBox Grid.Row="0" Grid.Column="0" Name="ShowInstalledVersionsCheckbox" Content="Show Installed Versions Only" Checked="ShowInstalledVersionsCheckboxChanged" Unchecked="ShowInstalledVersionsCheckboxChanged" IsChecked="{Binding UserPreferences.ShowInstalledVersions }" />
             <Grid Name="LoadingProgressGrid" Grid.Row="0" Grid.Column="2">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
diff --git a/SmokeyVersionSwitcher/MainWindow.xaml.cs b/SmokeyVersionSwitcher/MainWindow.xaml.cs
index 22b789c..98365a1 100644
--- a/SmokeyVersionSwitcher/MainWindow.xaml.cs
+++ b/SmokeyVersionSwitcher/MainWindow.xaml.cs
@@ -2,15 +2,17 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using Newtonsoft.Json;
 
 namespace SmokeyVersionSwitcher
 {
+    using System.Collections.Generic;
     using System.ComponentModel;
-    using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.IO;
     using System.IO.Compression;
     using System.Threading;
+    using System.Windows.Data;
     using Windows.ApplicationModel;
     using Windows.Foundation;
     using Windows.Management.Core;
@@ -23,51 +25,77 @@ namespace SmokeyVersionSwitcher
     /// </summary>
     public partial class MainWindow : Window, IVersionCommands
     {
-        private static readonly string VERSIONDB = "https://raw.githubusercontent.com/SmokeyStack/versiondb/main/versions.json";
-
+        public Preferences UserPreferences { get; }
+        private static readonly string PREFERENCES = @"preferences.json";
+        private static readonly string VERSION_DB = "https://raw.githubusercontent.com/SmokeyStack/versiondb/main/versions.json";
         private readonly VersionList _versions;
+        private readonly HashSet<CollectionViewSource> _versionsList = new HashSet<CollectionViewSource>();
         private readonly Downloader _anonVersionDownloader = new Downloader();
         private readonly Downloader _userVersionDownloader = new Downloader();
         private readonly Task _userVersionDownloaderLoginTask;
         private volatile int _userVersionDownloaderLoginTaskStarted;
         private volatile bool _hasLaunched = false;
-        private readonly ObservableCollection<Version> _installedVersions = new ObservableCollection<Version> { };
 
         public MainWindow()
         {
-            InitializeComponent();
-
-            InstalledList.DataContext = _installedVersions;
-            InstalledList.SelectedIndex = 0;
-            _versions = new VersionList("versions.json", VERSIONDB, this);
-            VersionList.DataContext = _versions;
+            if (File.Exists(PREFERENCES))
+            {
+                UserPreferences = JsonConvert.DeserializeObject<Preferences>(File.ReadAllText(PREFERENCES));
+            }
+            else
+            {
+                UserPreferences = new Preferences();
+                RewritePreferences();
+            }
 
+            _versions = new VersionList("versions.json", VERSION_DB, this, VersionEntryPropertyChanged);
+            InitializeComponent();
+            ShowInstalledVersionsCheckbox.DataContext = this;
+            CollectionViewSource versionListRelease = Resources["versionListRelease"] as CollectionViewSource;
+            CollectionViewSource versionListBeta = Resources["versionListBeta"] as CollectionViewSource;
+            CollectionViewSource versionListPreview = Resources["versionListPreview"] as CollectionViewSource;
+            CollectionViewSource versionListInstalled = Resources["versionListInstalled"] as CollectionViewSource;
+            versionListRelease.Filter += new FilterEventHandler((object sender, FilterEventArgs e) =>
+            {
+                Version version = e.Item as Version;
+                e.Accepted = version.Type == "Release" && (version.IsInstalled || version.IsStatusChanging || !(ShowInstalledVersionsCheckbox.IsChecked ?? false));
+            });
+            versionListBeta.Filter += new FilterEventHandler((object sender, FilterEventArgs e) =>
+            {
+                Version version = e.Item as Version;
+                e.Accepted = version.Type == "Beta" && (version.IsInstalled || version.IsStatusChanging || !(ShowInstalledVersionsCheckbox.IsChecked ?? false));
+            });
+            versionListPreview.Filter += new FilterEventHandler((object sender, FilterEventArgs e) =>
+            {
+                Version version = e.Item as Version;
+                e.Accepted = version.Type == "Preview" && (version.IsInstalled || version.IsStatusChanging || !(ShowInstalledVersionsCheckbox.IsChecked ?? false));
+            });
+            versionListInstalled.Filter += new FilterEventHandler((object sender, FilterEventArgs e) =>
+            {
+                Version version = e.Item as Version;
+                e.Accepted = version.IsInstalled || version.IsStatusChanging;
+            });
+            versionListRelease.Source = _versions;
+            VersionListRelease.DataContext = versionListRelease;
+            _ = _versionsList.Add(versionListRelease);
+            versionListBeta.Source = _versions;
+            VersionListBeta.DataContext = versionListBeta;
+            _ = _versionsList.Add(versionListBeta);
+            versionListPreview.Source = _versions;
+            VersionListPreview.DataContext = versionListPreview;
+            _ = _versionsList.Add(versionListPreview);
+            versionListInstalled.Source = _versions;
+            VersionListInstalled.DataContext = versionListInstalled;
             _userVersionDownloaderLoginTask = new Task(() =>
             {
                 _userVersionDownloader.EnableUserAuthorization();
             });
-
             Dispatcher.Invoke(LoadVersionList);
-
-            foreach (Version version in _versions)
-            {
-                if (version.IsInstalled)
-                {
-                    _installedVersions.Add(version);
-                }
-            }
         }
 
-        private void UpdateStatus(Version version)
-        {
-            if (version.StatusInfo == null)
-            {
-                VersionLoadingProgressLabel.Content = "";
-                return;
-            }
+        public ICommand InstallCommand => new RelayCommand((v) => InvokeInstall((Version)v));
 
-            VersionLoadingProgressLabel.Content = version.StatusInfo.DisplayStatus;
-        }
+        public ICommand UninstallCommand => new RelayCommand((v) => InvokeUninstall((Version)v));
 
         private async void LoadVersionList()
         {
@@ -84,7 +112,7 @@ private async void LoadVersionList()
                 Debug.WriteLine("List cache load failed:\n" + e.ToString());
             }
 
-            LoadingProgressLabel.Content = "Updating versions list from " + VERSIONDB;
+            LoadingProgressLabel.Content = "Updating versions list from " + VERSION_DB;
             LoadingProgressBar.Value = 2;
 
             try
@@ -94,34 +122,18 @@ private async void LoadVersionList()
             catch (Exception e)
             {
                 Debug.WriteLine("List download failed:\n" + e.ToString());
-                MessageBox.Show("Failed to update version list from the internet. Some new versions might be missing.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                _ = MessageBox.Show("Failed to update version list from the internet. Some new versions might be missing.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
 
             LoadingProgressGrid.Visibility = Visibility.Collapsed;
+            VersionListInstalled.SelectedIndex = 0;
         }
 
-        private void MenuItemRefreshVersionListClicked(object sender, RoutedEventArgs e) => Dispatcher.Invoke(LoadVersionList);
+        private void VersionEntryPropertyChanged(object sender, PropertyChangedEventArgs e) => RefreshVersionLists();
 
-        private void MenuItemOpenLogFileClicked(object sender, RoutedEventArgs e)
+        private void InvokeLaunch(object sender, RoutedEventArgs args)
         {
-            if (!File.Exists(@"Log.txt"))
-            {
-                _ = MessageBox.Show("Log file not found", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            else
-            {
-                _ = Process.Start(@"Log.txt");
-            }
-        }
-
-        private void MenuItemOpenDataDirClicked(object sender, RoutedEventArgs e) => Process.Start(@"explorer.exe", Directory.GetCurrentDirectory());
-
-        public ICommand InstallCommand => new RelayCommand((v) => InvokeInstall((Version)v));
-        public ICommand UninstallCommand => new RelayCommand((v) => InvokeUninstall((Version)v));
-
-        private void Launch(object sender, RoutedEventArgs e)
-        {
-            Version version = (Version)InstalledList.SelectedItem;
+            Version version = (Version)VersionListInstalled.SelectedItem;
 
             if (_hasLaunched)
             {
@@ -132,355 +144,379 @@ private void Launch(object sender, RoutedEventArgs e)
             _ = Task.Run(async () =>
             {
                 version.StatusInfo = new Status(State.Registering);
-                Dispatcher.Invoke(new Action(() => UpdateStatus(version)));
-                string gameDir = Path.GetFullPath(version.GameDirectory);
+                string gameDirectory = Path.GetFullPath(version.GameDirectory);
 
                 try
                 {
-                    await ReRegisterPackage(version.GamePackageFamily, gameDir);
+                    await ReRegisterPackage(version.GamePackageFamily, gameDirectory);
                 }
-                catch (Exception ee)
+                catch (Exception e)
                 {
-                    Debug.WriteLine("App re-register failed:\n" + ee.ToString());
-                    _ = MessageBox.Show("App re-register failed:\n" + ee.ToString());
+                    Debug.WriteLine("App re-register failed:\n" + e.ToString());
+                    _ = MessageBox.Show("App re-register failed:\n" + e.ToString());
                     _hasLaunched = false;
                     version.StatusInfo = null;
-                    Dispatcher.Invoke(new Action(() => UpdateStatus(version)));
                     return;
                 }
 
                 version.StatusInfo = new Status(State.Launching);
-                Dispatcher.Invoke(new Action(() => UpdateStatus(version)));
 
                 try
                 {
-                    System.Collections.Generic.IList<AppDiagnosticInfo> pkg = await AppDiagnosticInfo.RequestInfoForPackageAsync(version.GamePackageFamily);
+                    IList<AppDiagnosticInfo> package = await AppDiagnosticInfo.RequestInfoForPackageAsync(version.GamePackageFamily);
 
-                    if (pkg.Count > 0)
+                    if (package.Count > 0)
                     {
-                        _ = await pkg[0].LaunchAsync();
+                        _ = await package[0].LaunchAsync();
                     }
 
                     Debug.WriteLine("App launch finished!");
                     _hasLaunched = false;
                     version.StatusInfo = null;
-                    Dispatcher.Invoke(new Action(() => UpdateStatus(version)));
                 }
-                catch (Exception eee)
+                catch (Exception e)
                 {
-                    Debug.WriteLine("App launch failed:\n" + eee.ToString());
-                    _ = MessageBox.Show("App launch failed:\n" + eee.ToString());
+                    Debug.WriteLine("App launch failed:\n" + e.ToString());
+                    _ = MessageBox.Show("App launch failed:\n" + e.ToString());
                     _hasLaunched = false;
                     version.StatusInfo = null;
-                    Dispatcher.Invoke(new Action(() => UpdateStatus(version)));
                     return;
                 }
             });
         }
 
-        private void InvokeInstall(Version version)
+        private async Task DeploymentProgressWrapper(IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> t)
         {
-            CancellationTokenSource cancelSource = new CancellationTokenSource();
-            version.StatusInfo = new Status(State.Initializing)
+            TaskCompletionSource<int> source = new TaskCompletionSource<int>();
+            t.Progress += (v, p) =>
             {
-                CancelCommand = new RelayCommand((o) => cancelSource.Cancel())
+                Debug.WriteLine("Deployment progress: " + p.state + " " + p.percentage + "%");
             };
-
-            Debug.WriteLine("Download start");
-
-            _ = Task.Run(async () =>
-              {
-                  string dlPath = (version.Type == "Preview" ? "Minecraft-Preview-" : "Minecraft-") + version.Name + ".Appx";
-                  Downloader downloader = _anonVersionDownloader;
-
-                  if (version.Type == "Beta")
-                  {
-                      downloader = _userVersionDownloader;
-
-                      if (Interlocked.CompareExchange(ref _userVersionDownloaderLoginTaskStarted, 1, 0) == 0)
-                      {
-                          _userVersionDownloaderLoginTask.Start();
-                      }
-
-                      Debug.WriteLine("Waiting for authentication");
-
-                      try
-                      {
-                          await _userVersionDownloaderLoginTask;
-                          Debug.WriteLine("Authentication complete");
-                      }
-                      catch (WUTokenHelper.WUTokenException e)
-                      {
-                          Debug.WriteLine("Authentication failed:\n" + e.ToString());
-                          _ = MessageBox.Show("Failed to authenticate because: " + e.Message, "Authentication failed");
-                          version.StatusInfo = null;
-                          return;
-                      }
-                      catch (Exception e)
-                      {
-                          Debug.WriteLine("Authentication failed:\n" + e.ToString());
-                          _ = MessageBox.Show(e.ToString(), "Authentication failed");
-                          version.StatusInfo = null;
-                          return;
-                      }
-                  }
-
-                  try
-                  {
-                      await downloader.Download(version.UUID, "1", dlPath, (current, total) =>
-                      {
-                          if (version.StatusInfo.State != State.Installing)
-                          {
-                              Debug.WriteLine("Actual download started");
-                              version.StatusInfo.State = State.Installing;
-
-                              if (total.HasValue)
-                              {
-                                  version.StatusInfo.TotalBytes = total.Value;
-                              }
-                          }
-
-                          version.StatusInfo.DownloadedBytes = current;
-                      }, cancelSource.Token);
-                      Debug.WriteLine("Download complete");
-                  }
-                  catch (BadUpdateIdentityException)
-                  {
-                      Debug.WriteLine("Download failed due to failure to fetch download URL");
-                      _ = MessageBox.Show(
-                          "Unable to fetch download URL for version." +
-                          (version.Type == "Beta" ? "\nFor beta versions, please make sure your account is subscribed to the Minecraft beta programme in the Xbox Insider Hub app." : "")
-                      );
-                      version.StatusInfo = null;
-                      return;
-                  }
-                  catch (Exception e)
-                  {
-                      Debug.WriteLine("Download failed:\n" + e.ToString());
-
-                      if (!(e is TaskCanceledException))
-                      {
-                          _ = MessageBox.Show("Download failed:\n" + e.ToString());
-                      }
-
-                      version.StatusInfo = null;
-                      return;
-                  }
-
-                  try
-                  {
-                      version.StatusInfo.State = State.Extracting;
-                      string dirPath = version.GameDirectory;
-
-                      if (Directory.Exists(dirPath))
-                      {
-                          Directory.Delete(dirPath, true);
-                      }
-
-                      ZipFile.ExtractToDirectory(dlPath, dirPath);
-                      version.StatusInfo = null;
-                      File.Delete(Path.Combine(dirPath, "AppxSignature.p7x"));
-                      File.Delete(dlPath);
-                      Application.Current.Dispatcher.Invoke(delegate
-                      {
-                          _installedVersions.Add(version);
-                      });
-                  }
-                  catch (Exception e)
-                  {
-                      Debug.WriteLine("Extraction failed:\n" + e.ToString());
-                      _ = MessageBox.Show("Extraction failed:\n" + e.ToString());
-                      version.StatusInfo = null;
-                      return;
-                  }
-                  version.StatusInfo = null;
-                  version.UpdateInstallStatus();
-              });
+            t.Completed += (v, p) =>
+            {
+                if (p == AsyncStatus.Error)
+                {
+                    Debug.WriteLine("Deployment failed: " + v.GetResults().ErrorText);
+                    source.SetException(new Exception("Deployment failed: " + v.GetResults().ErrorText));
+                }
+                else
+                {
+                    Debug.WriteLine("Deployment done: " + p);
+                    source.SetResult(1);
+                }
+            };
+            _ = await source.Task;
         }
 
-        private void InvokeUninstall(Version version)
+        private string GetBackupMinecraftDataDirectory()
         {
-            _ = Task.Run(async () => await Remove(version));
+            string localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string tmpDir = Path.Combine(localAppData, "TmpSmokeyStackMinecraftLocalState");
+            return tmpDir;
         }
 
-        private async Task Remove(Version version)
+        private void BackupMinecraftDataForRemoval(string packageFamily)
         {
-            version.StatusInfo = new Status(State.Uninstalling);
-            await UnregisterPackage(version.GamePackageFamily, Path.GetFullPath(version.GameDirectory));
-            Directory.Delete(version.GameDirectory, true);
-            version.StatusInfo = null;
-            version.UpdateInstallStatus();
-            Debug.WriteLine("Removed release version " + version.Name);
-        }
+            Windows.Storage.ApplicationData data = ApplicationDataManager.CreateForPackageFamily(packageFamily);
+            string tempDirectory = GetBackupMinecraftDataDirectory();
 
-        private async Task UnregisterPackage(string packageFamily, string gameDir)
-        {
-            foreach (Package pkg in new PackageManager().FindPackages(packageFamily))
+            if (Directory.Exists(tempDirectory))
             {
-                string location = GetPackagePath(pkg);
-
-                if (location == "" || location == gameDir)
-                {
-                    await RemovePackage(pkg, packageFamily);
-                }
+                Debug.WriteLine("BackupMinecraftDataForRemoval error: " + tempDirectory + " already exists");
+                _ = Process.Start("explorer.exe", tempDirectory);
+                _ = MessageBox.Show("The temporary directory for backing up MC data already exists. This probably means that we failed last time backing up the data. Please back the directory up manually.");
+                throw new Exception("Temporary dir exists");
             }
+
+            Debug.WriteLine("Moving Minecraft data to: " + tempDirectory);
+            Directory.Move(data.LocalFolder.Path, tempDirectory);
         }
 
-        private async Task ReRegisterPackage(string packageFamily, string gameDir)
+        private void RestoreMove(string from, string to)
         {
-            foreach (Package pkg in new PackageManager().FindPackages(packageFamily))
+            foreach (string f in Directory.EnumerateFiles(from))
             {
-                string location = GetPackagePath(pkg);
+                string ft = Path.Combine(to, Path.GetFileName(f));
 
-                if (location == gameDir)
+                if (File.Exists(ft))
                 {
-                    Debug.WriteLine("Skipping package removal - same path: " + pkg.Id.FullName + " " + location);
-                    return;
+                    if (MessageBox.Show("The file " + ft + " already exists in the destination.\nDo you want to replace it? The old file will be lost otherwise.", "Restoring data directory from previous installation", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+                    {
+                        continue;
+                    }
+
+                    File.Delete(ft);
                 }
 
-                await RemovePackage(pkg, packageFamily);
+                File.Move(f, ft);
             }
+            foreach (string f in Directory.EnumerateDirectories(from))
+            {
+                string tp = Path.Combine(to, Path.GetFileName(f));
+                if (!Directory.Exists(tp))
+                {
+                    if (File.Exists(tp) && MessageBox.Show("The file " + tp + " is not a directory. Do you want to remove it? The data from the old directory will be lost otherwise.", "Restoring data directory from previous installation", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+                    {
+                        continue;
+                    }
 
-            Debug.WriteLine("Registering package");
-            string manifestPath = Path.Combine(gameDir, "AppxManifest.xml");
-            await DeploymentProgressWrapper(new PackageManager().RegisterPackageAsync(new Uri(manifestPath), null, DeploymentOptions.DevelopmentMode));
-            Debug.WriteLine("App re-register done!");
+                    _ = Directory.CreateDirectory(tp);
+                }
+
+                RestoreMove(f, tp);
+            }
         }
 
-        private string GetPackagePath(Package pkg)
+        private void RestoreMinecraftDataFromReinstall(string packageFamily)
         {
-            try
-            {
-                return pkg.InstalledLocation.Path;
-            }
-            catch (FileNotFoundException)
+            string tempDirectory = GetBackupMinecraftDataDirectory();
+
+            if (!Directory.Exists(tempDirectory))
             {
-                return "";
+                return;
             }
+
+            Windows.Storage.ApplicationData data = ApplicationDataManager.CreateForPackageFamily(packageFamily);
+            Debug.WriteLine("Moving backup Minecraft data to: " + data.LocalFolder.Path);
+            RestoreMove(tempDirectory, data.LocalFolder.Path);
+            Directory.Delete(tempDirectory, true);
         }
 
-        private async Task RemovePackage(Package pkg, string packageFamily)
+        private async Task RemovePackage(Package pacakge, string packageFamily)
         {
-            Debug.WriteLine("Removing package: " + pkg.Id.FullName);
+            Debug.WriteLine("Removing package: " + pacakge.Id.FullName);
 
-            if (!pkg.IsDevelopmentMode)
+            if (!pacakge.IsDevelopmentMode)
             {
                 BackupMinecraftDataForRemoval(packageFamily);
-                await DeploymentProgressWrapper(new PackageManager().RemovePackageAsync(pkg.Id.FullName, 0));
+                await DeploymentProgressWrapper(new PackageManager().RemovePackageAsync(pacakge.Id.FullName, 0));
             }
             else
             {
                 Debug.WriteLine("Package is in development mode");
-                await DeploymentProgressWrapper(new PackageManager().RemovePackageAsync(pkg.Id.FullName, RemovalOptions.PreserveApplicationData));
+                await DeploymentProgressWrapper(new PackageManager().RemovePackageAsync(pacakge.Id.FullName, RemovalOptions.PreserveApplicationData));
             }
 
-            Debug.WriteLine("Removal of package done: " + pkg.Id.FullName);
+            Debug.WriteLine("Removal of package done: " + pacakge.Id.FullName);
         }
 
-        private void BackupMinecraftDataForRemoval(string packageFamily)
+        private string GetPackagePath(Package package)
         {
-            Windows.Storage.ApplicationData data = ApplicationDataManager.CreateForPackageFamily(packageFamily);
-            string tmpDir = GetBackupMinecraftDataDir();
-
-            if (Directory.Exists(tmpDir))
+            try
             {
-                Debug.WriteLine("BackupMinecraftDataForRemoval error: " + tmpDir + " already exists");
-                _ = Process.Start("explorer.exe", tmpDir);
-                _ = MessageBox.Show("The temporary directory for backing up MC data already exists. This probably means that we failed last time backing up the data. Please back the directory up manually.");
-                throw new Exception("Temporary dir exists");
+                return package.InstalledLocation.Path;
+            }
+            catch (FileNotFoundException)
+            {
+                return "";
             }
-
-            Debug.WriteLine("Moving Minecraft data to: " + tmpDir);
-            Directory.Move(data.LocalFolder.Path, tmpDir);
         }
 
-        private string GetBackupMinecraftDataDir()
+        private async Task UnregisterPackage(string packageFamily, string gameDirectory)
         {
-            string localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            string tmpDir = Path.Combine(localAppData, "TmpMinecraftLocalState");
-            return tmpDir;
+            foreach (Package package in new PackageManager().FindPackages(packageFamily))
+            {
+                string location = GetPackagePath(package);
+
+                if (location == "" || location == gameDirectory)
+                {
+                    await RemovePackage(package, packageFamily);
+                }
+            }
         }
 
-        private async Task DeploymentProgressWrapper(IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> t)
+        private async Task ReRegisterPackage(string packageFamily, string gameDirectory)
         {
-            TaskCompletionSource<int> src = new TaskCompletionSource<int>();
-            t.Progress += (v, p) =>
+            foreach (Package package in new PackageManager().FindPackages(packageFamily))
             {
-                Debug.WriteLine("Deployment progress: " + p.state + " " + p.percentage + "%");
-            };
+                string location = GetPackagePath(package);
 
-            t.Completed += (v, p) =>
-            {
-                if (p == AsyncStatus.Error)
+                if (location == gameDirectory)
                 {
-                    Debug.WriteLine("Deployment failed: " + v.GetResults().ErrorText);
-                    src.SetException(new Exception("Deployment failed: " + v.GetResults().ErrorText));
-                }
-                else
-                {
-                    Debug.WriteLine("Deployment done: " + p);
-                    src.SetResult(1);
+                    Debug.WriteLine("Skipping package removal - same path: " + package.Id.FullName + " " + location);
+                    return;
                 }
-            };
 
-            await src.Task;
+                await RemovePackage(package, packageFamily);
+            }
+
+            Debug.WriteLine("Registering package");
+            string manifestPath = Path.Combine(gameDirectory, "AppxManifest.xml");
+            await DeploymentProgressWrapper(new PackageManager().RegisterPackageAsync(new Uri(manifestPath), null, DeploymentOptions.DevelopmentMode));
+            Debug.WriteLine("App re-register done!");
+            RestoreMinecraftDataFromReinstall(packageFamily);
         }
 
-        private void RestoreMinecraftDataFromReinstall(string packageFamily)
+        private void InvokeInstall(Version version)
         {
-            string tmpDir = GetBackupMinecraftDataDir();
+            CancellationTokenSource cancelSource = new CancellationTokenSource();
+            version.IsNew = false;
+            version.StatusInfo = new Status(State.Initializing)
+            {
+                CancelCommand = new RelayCommand((o) => cancelSource.Cancel())
+            };
+            Debug.WriteLine("Download start");
 
-            if (!Directory.Exists(tmpDir))
+            _ = Task.Run(async () =>
             {
-                return;
-            }
+                string downloadPath = (version.Type == "Preview" ? "Minecraft-Preview-" : "Minecraft-") + version.Name + ".Appx";
+                Downloader downloader = _anonVersionDownloader;
 
-            Windows.Storage.ApplicationData data = ApplicationDataManager.CreateForPackageFamily(packageFamily);
-            Debug.WriteLine("Moving backup Minecraft data to: " + data.LocalFolder.Path);
-            RestoreMove(tmpDir, data.LocalFolder.Path);
-            Directory.Delete(tmpDir, true);
-        }
+                if (version.Type == "Beta")
+                {
+                    downloader = _userVersionDownloader;
 
-        private void RestoreMove(string from, string to)
-        {
-            foreach (string f in Directory.EnumerateFiles(from))
-            {
-                string ft = Path.Combine(to, Path.GetFileName(f));
+                    if (Interlocked.CompareExchange(ref _userVersionDownloaderLoginTaskStarted, 1, 0) == 0)
+                    {
+                        _userVersionDownloaderLoginTask.Start();
+                    }
 
-                if (File.Exists(ft))
+                    Debug.WriteLine("Waiting for authentication");
+
+                    try
+                    {
+                        await _userVersionDownloaderLoginTask;
+                        Debug.WriteLine("Authentication complete");
+                    }
+                    catch (WUTokenHelper.WUTokenException e)
+                    {
+                        Debug.WriteLine("Authentication failed:\n" + e.ToString());
+                        _ = MessageBox.Show("Failed to authenticate because: " + e.Message, "Authentication failed");
+                        version.StatusInfo = null;
+                        return;
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.WriteLine("Authentication failed:\n" + e.ToString());
+                        _ = MessageBox.Show(e.ToString(), "Authentication failed");
+                        version.StatusInfo = null;
+                        return;
+                    }
+                }
+
+                try
                 {
-                    if (MessageBox.Show("The file " + ft + " already exists in the destination.\nDo you want to replace it? The old file will be lost otherwise.", "Restoring data directory from previous installation", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+                    await downloader.Download(version.UUID, "1", downloadPath, (current, total) =>
                     {
-                        continue;
+                        if (version.StatusInfo.State != State.Installing)
+                        {
+                            Debug.WriteLine("Actual download started");
+                            version.StatusInfo.State = State.Installing;
+
+                            if (total.HasValue)
+                            {
+                                version.StatusInfo.TotalBytes = total.Value;
+                            }
+                        }
+
+                        version.StatusInfo.DownloadedBytes = current;
+                    }, cancelSource.Token);
+                    Debug.WriteLine("Download complete");
+                }
+                catch (BadUpdateIdentityException)
+                {
+                    Debug.WriteLine("Download failed due to failure to fetch download URL");
+                    _ = MessageBox.Show(
+                        "Unable to fetch download URL for version." +
+                        (version.Type == "Beta" ? "\nFor beta versions, please make sure your account is subscribed to the Minecraft beta programme in the Xbox Insider Hub app." : "")
+                    );
+                    version.StatusInfo = null;
+                    return;
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine("Download failed:\n" + e.ToString());
+
+                    if (!(e is TaskCanceledException))
+                    {
+                        _ = MessageBox.Show("Download failed:\n" + e.ToString());
                     }
 
-                    File.Delete(ft);
+                    version.StatusInfo = null;
+                    return;
                 }
 
-                File.Move(f, ft);
-            }
-            foreach (string f in Directory.EnumerateDirectories(from))
-            {
-                string tp = Path.Combine(to, Path.GetFileName(f));
-                if (!Directory.Exists(tp))
+                try
                 {
-                    if (File.Exists(tp) && MessageBox.Show("The file " + tp + " is not a directory. Do you want to remove it? The data from the old directory will be lost otherwise.", "Restoring data directory from previous installation", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
+                    version.StatusInfo.State = State.Extracting;
+                    string directoryPath = version.GameDirectory;
+
+                    if (Directory.Exists(directoryPath))
                     {
-                        continue;
+                        Directory.Delete(directoryPath, true);
                     }
 
-                    _ = Directory.CreateDirectory(tp);
+                    ZipFile.ExtractToDirectory(downloadPath, directoryPath);
+                    version.StatusInfo = null;
+                    File.Delete(Path.Combine(directoryPath, "AppxSignature.p7x"));
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine("Extraction failed:\n" + e.ToString());
+                    _ = MessageBox.Show("Extraction failed:\n" + e.ToString());
+                    version.StatusInfo = null;
+                    return;
                 }
+                version.StatusInfo = null;
+                version.UpdateInstallStatus();
+                Dispatcher.Invoke(LoadVersionList);
+            });
+        }
 
-                RestoreMove(f, tp);
+        private async Task Remove(Version version)
+        {
+            version.StatusInfo = new Status(State.Uninstalling);
+            await UnregisterPackage(version.GamePackageFamily, Path.GetFullPath(version.GameDirectory));
+            Directory.Delete(version.GameDirectory, true);
+            version.StatusInfo = null;
+            version.UpdateInstallStatus();
+            Debug.WriteLine("Removed version " + version.Name);
+            Dispatcher.Invoke(LoadVersionList);
+        }
+
+        private void InvokeUninstall(Version version)
+        {
+            _ = Task.Run(async () => await Remove(version));
+        }
+
+        private void ShowInstalledVersionsCheckboxChanged(object sender, RoutedEventArgs e)
+        {
+            UserPreferences.ShowInstalledVersions = ShowInstalledVersionsCheckbox.IsChecked ?? false;
+            RefreshVersionLists();
+            RewritePreferences();
+        }
+
+        private void RefreshVersionLists()
+        {
+            Dispatcher.Invoke(() =>
+            {
+                foreach (CollectionViewSource source in _versionsList)
+                {
+                    source.View.Refresh();
+                }
+            });
+        }
+
+        private void RewritePreferences()
+        {
+            File.WriteAllText(PREFERENCES, JsonConvert.SerializeObject(UserPreferences));
+        }
+
+        private void MenuItemOpenLogFileClicked(object sender, RoutedEventArgs e)
+        {
+            if (!File.Exists(@"Log.txt"))
+            {
+                _ = MessageBox.Show("Log file not found", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            else
+            {
+                _ = Process.Start(@"Log.txt");
             }
         }
-    }
 
-    struct MinecraftPackageFamilies
-    {
-        public static readonly string Minecraft = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
-        public static readonly string MinecraftPreview = "Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe";
+        private void MenuItemOpenDataDirectoryClicked(object sender, RoutedEventArgs e) => Process.Start(@"explorer.exe", Directory.GetCurrentDirectory());
+
+        private void MenuItemRefreshVersionListClicked(object sender, RoutedEventArgs e) => Dispatcher.Invoke(LoadVersionList);
     }
 
     namespace WPFDataTypes
@@ -500,11 +536,12 @@ public interface IVersionCommands
 
         public class Version : NotifyPropertyChangedBase
         {
-            public Version(string name, string type, string uuid, IVersionCommands commands)
+            public Version(string name, string type, string uuid, IVersionCommands commands, bool isNew)
             {
                 Name = name;
                 Type = type;
                 UUID = uuid;
+                IsNew = isNew;
                 InstallCommand = commands.InstallCommand;
                 UninstallCommand = commands.UninstallCommand;
                 GameDirectory = (type == "Preview" ? "Minecraft-Preview-" : "Minecraft-") + Name;
@@ -513,23 +550,29 @@ public Version(string name, string type, string uuid, IVersionCommands commands)
             public string Name { get; set; }
             public string Type { get; set; }
             public string UUID { get; set; }
+            public bool IsNew
+            {
+                get { return _isNew; }
+                set
+                {
+                    _isNew = value;
+                    OnPropertyChanged("IsNew");
+                }
+            }
             public string GameDirectory { get; set; }
             public string GamePackageFamily => Type == "Preview" ? MinecraftPackageFamilies.MinecraftPreview : MinecraftPackageFamilies.Minecraft;
             public bool IsInstalled => Directory.Exists(GameDirectory);
             public ICommand InstallCommand { get; set; }
             public ICommand UninstallCommand { get; set; }
-            private Status _statusInfo;
             public Status StatusInfo
             {
                 get => _statusInfo;
                 set { _statusInfo = value; OnPropertyChanged("StatusInfo"); OnPropertyChanged("IsStatusChanging"); }
             }
             public bool IsStatusChanging => StatusInfo != null;
-
-            public void UpdateInstallStatus()
-            {
-                OnPropertyChanged("IsInstalled");
-            }
+            public void UpdateInstallStatus() => OnPropertyChanged("IsInstalled");
+            private Status _statusInfo;
+            private bool _isNew = false;
         }
 
         public enum State
@@ -547,10 +590,7 @@ public class Status : NotifyPropertyChangedBase
             private State _state;
             private long _downloadedBytes;
             private long _totalBytes;
-            public Status(State state)
-            {
-                _state = state;
-            }
+            public Status(State state) => _state = state;
             public State State
             {
                 get => _state;
diff --git a/SmokeyVersionSwitcher/MinecraftPackageFamilies.cs b/SmokeyVersionSwitcher/MinecraftPackageFamilies.cs
new file mode 100644
index 0000000..ea3b8b5
--- /dev/null
+++ b/SmokeyVersionSwitcher/MinecraftPackageFamilies.cs
@@ -0,0 +1,8 @@
+namespace SmokeyVersionSwitcher
+{
+    readonly struct MinecraftPackageFamilies
+    {
+        public static readonly string Minecraft = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
+        public static readonly string MinecraftPreview = "Microsoft.MinecraftWindowsBeta_8wekyb3d8bbwe";
+    }
+}
\ No newline at end of file
diff --git a/SmokeyVersionSwitcher/Preferences.cs b/SmokeyVersionSwitcher/Preferences.cs
new file mode 100644
index 0000000..8710fcf
--- /dev/null
+++ b/SmokeyVersionSwitcher/Preferences.cs
@@ -0,0 +1,7 @@
+namespace SmokeyVersionSwitcher
+{
+    public class Preferences
+    {
+        public bool ShowInstalledVersions { get; set; } = false;
+    }
+}
diff --git a/SmokeyVersionSwitcher/SampleData/SampleClasses.cs b/SmokeyVersionSwitcher/SampleData/SampleClasses.cs
new file mode 100644
index 0000000..698c3ab
--- /dev/null
+++ b/SmokeyVersionSwitcher/SampleData/SampleClasses.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace SmokeyVersionSwitcher.SampleData
+{
+    public class SampleVersion
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+        public string DisplayInstallStatus { get; set; }
+
+        public bool IsInstalled { get; set; }
+
+        public bool IsBeta { get; set; }
+    }
+
+    public class SampleVersionList : List<SampleVersion> { }
+}
\ No newline at end of file
diff --git a/SmokeyVersionSwitcher/SampleData/Versions.xaml b/SmokeyVersionSwitcher/SampleData/Versions.xaml
new file mode 100644
index 0000000..f0da1fc
--- /dev/null
+++ b/SmokeyVersionSwitcher/SampleData/Versions.xaml
@@ -0,0 +1,4 @@
+<local:SampleVersionList xmlns:local="clr-namespace:SmokeyVersionSwitcher.SampleData">
+    <local:SampleVersion DisplayName="1.9.0.15" IsBeta="False" IsInstalled="False" DisplayInstallStatus="Not installed"/>
+    <local:SampleVersion DisplayName="1.10.0.4" IsBeta="True" IsInstalled="True" DisplayInstallStatus="Installed"/>
+</local:SampleVersionList>
\ No newline at end of file
diff --git a/SmokeyVersionSwitcher/SmokeyVersionSwitcher.csproj b/SmokeyVersionSwitcher/SmokeyVersionSwitcher.csproj
index b80acd6..1da28ef 100644
--- a/SmokeyVersionSwitcher/SmokeyVersionSwitcher.csproj
+++ b/SmokeyVersionSwitcher/SmokeyVersionSwitcher.csproj
@@ -52,7 +52,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -101,7 +101,10 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Downloader.cs" />
+    <Compile Include="MinecraftPackageFamilies.cs" />
+    <Compile Include="Preferences.cs" />
     <Compile Include="RelayCommand.cs" />
+    <Compile Include="SampleData\SampleClasses.cs" />
     <Compile Include="VersionList.cs" />
     <Compile Include="WUProtocol.cs" />
     <Compile Include="WUTokenHelper.cs" />
@@ -117,6 +120,9 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="SampleData\Versions.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/SmokeyVersionSwitcher/VersionList.cs b/SmokeyVersionSwitcher/VersionList.cs
index e6148b8..7311ea9 100644
--- a/SmokeyVersionSwitcher/VersionList.cs
+++ b/SmokeyVersionSwitcher/VersionList.cs
@@ -1,7 +1,9 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 
@@ -13,21 +15,45 @@ class VersionList : ObservableCollection<WPFDataTypes.Version>
         private readonly string _versiondb;
         private readonly HttpClient _client = new HttpClient();
         private readonly WPFDataTypes.IVersionCommands _commands;
+        private readonly PropertyChangedEventHandler _versionPropertyChangedEventHandler;
 
-        public VersionList(string cache_file, string versiondb, WPFDataTypes.IVersionCommands commands)
+        public VersionList(string cacheFile, string versiondb, WPFDataTypes.IVersionCommands commands, PropertyChangedEventHandler versionPropertyChangedEventHandler)
         {
-            _cacheFile = cache_file;
+            _cacheFile = cacheFile;
             _versiondb = versiondb;
             _commands = commands;
+            _versionPropertyChangedEventHandler = versionPropertyChangedEventHandler;
+            CollectionChanged += VersionListOnCollectionChanged;
         }
 
-        private void ParseList(JArray data)
+        private void VersionListOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.OldItems != null)
+            {
+                foreach (var item in e.OldItems)
+                {
+                    var version = item as WPFDataTypes.Version;
+                    version.PropertyChanged -= _versionPropertyChangedEventHandler;
+                }
+            }
+            if (e.NewItems != null)
+            {
+                foreach (var item in e.NewItems)
+                {
+                    var version = item as WPFDataTypes.Version;
+                    version.PropertyChanged += _versionPropertyChangedEventHandler;
+                }
+            }
+        }
+
+        private void ParseList(JArray data, bool isCache)
         {
             Clear();
 
-            foreach (JObject keys in data)
+            foreach (JObject keys in data.Cast<JObject>())
             {
-                Add(new WPFDataTypes.Version((string)keys["Name"], (string)keys["Type"], (string)keys["UUID"], _commands));
+                bool isNew = !isCache;
+                Add(new WPFDataTypes.Version((string)keys["Name"], (string)keys["Type"], (string)keys["UUID"], _commands, isNew));
             }
         }
 
@@ -35,8 +61,11 @@ public async Task LoadFromCache()
         {
             try
             {
-                JArray jArray = JsonConvert.DeserializeObject<JArray>(File.ReadAllText(_cacheFile));
-                ParseList(jArray);
+                using (StreamReader reader = File.OpenText(_cacheFile))
+                {
+                    string data = await reader.ReadToEndAsync();
+                    ParseList(JArray.Parse(data), true);
+                }
             }
             catch (FileNotFoundException)
             { // ignore
@@ -46,10 +75,10 @@ public async Task LoadFromCache()
         public async Task DownloadList()
         {
             HttpResponseMessage resp = await _client.GetAsync(_versiondb);
-            _ = resp.EnsureSuccessStatusCode();
+            resp.EnsureSuccessStatusCode();
             string data = await resp.Content.ReadAsStringAsync();
             File.WriteAllText(_cacheFile, data);
-            ParseList(JArray.Parse(data));
+            ParseList(JArray.Parse(data), false);
         }
     }
 }