diff --git a/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj b/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj
index f00753d..4e3476f 100644
--- a/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj
+++ b/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{81231CE9-96E4-09DA-53C7-714106FA6BD5}</ProjectGuid>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
@@ -26,7 +26,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
                  Label="Configuration">
@@ -35,7 +35,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
@@ -46,7 +46,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -60,7 +60,7 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">juicysfplugin</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
@@ -146,17 +146,16 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Source\BankAndPreset.cpp"/>
     <ClCompile Include="..\..\Source\FilePicker.cpp"/>
     <ClCompile Include="..\..\Source\FluidSynthModel.cpp"/>
     <ClCompile Include="..\..\Source\MyColours.cpp"/>
-    <ClCompile Include="..\..\Source\Pill.cpp"/>
     <ClCompile Include="..\..\Source\Pills.cpp"/>
     <ClCompile Include="..\..\Source\Preset.cpp"/>
     <ClCompile Include="..\..\Source\SoundfontSynthSound.cpp"/>
     <ClCompile Include="..\..\Source\SoundfontSynthVoice.cpp"/>
     <ClCompile Include="..\..\Source\SurjectiveMidiKeyboardComponent.cpp"/>
     <ClCompile Include="..\..\Source\TableComponent.cpp"/>
-    <ClCompile Include="..\..\Source\TableModel.cpp"/>
     <ClCompile Include="..\..\Source\TablesComponent.cpp"/>
     <ClCompile Include="..\..\Source\PluginProcessor.cpp"/>
     <ClCompile Include="..\..\Source\PluginEditor.cpp"/>
@@ -1896,10 +1895,12 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_video.cpp"/>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Source\BankAndPreset.h"/>
+    <ClInclude Include="..\..\Source\ExposesComponents.h"/>
+    <ClInclude Include="..\..\Source\FilePickerFragment.h"/>
     <ClInclude Include="..\..\Source\FilePicker.h"/>
     <ClInclude Include="..\..\Source\FluidSynthModel.h"/>
     <ClInclude Include="..\..\Source\MyColours.h"/>
-    <ClInclude Include="..\..\Source\Pill.h"/>
     <ClInclude Include="..\..\Source\Pills.h"/>
     <ClInclude Include="..\..\Source\Preset.h"/>
     <ClInclude Include="..\..\Source\PresetsToBanks.h"/>
@@ -1907,7 +1908,6 @@
     <ClInclude Include="..\..\Source\SoundfontSynthVoice.h"/>
     <ClInclude Include="..\..\Source\SurjectiveMidiKeyboardComponent.h"/>
     <ClInclude Include="..\..\Source\TableComponent.h"/>
-    <ClInclude Include="..\..\Source\TableModel.h"/>
     <ClInclude Include="..\..\Source\TablesComponent.h"/>
     <ClInclude Include="..\..\Source\PluginProcessor.h"/>
     <ClInclude Include="..\..\Source\PluginEditor.h"/>
diff --git a/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj.filters b/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj.filters
index fdbd014..31ed5bd 100644
--- a/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj.filters
+++ b/Builds/VisualStudio2017/juicysfplugin_SharedCode.vcxproj.filters
@@ -391,6 +391,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\Source\BankAndPreset.cpp">
+      <Filter>juicysfplugin\Source</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\FilePicker.cpp">
       <Filter>juicysfplugin\Source</Filter>
     </ClCompile>
@@ -400,9 +403,6 @@
     <ClCompile Include="..\..\Source\MyColours.cpp">
       <Filter>juicysfplugin\Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Pill.cpp">
-      <Filter>juicysfplugin\Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\Pills.cpp">
       <Filter>juicysfplugin\Source</Filter>
     </ClCompile>
@@ -421,9 +421,6 @@
     <ClCompile Include="..\..\Source\TableComponent.cpp">
       <Filter>juicysfplugin\Source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\TableModel.cpp">
-      <Filter>juicysfplugin\Source</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Source\TablesComponent.cpp">
       <Filter>juicysfplugin\Source</Filter>
     </ClCompile>
@@ -2325,6 +2322,15 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\Source\BankAndPreset.h">
+      <Filter>juicysfplugin\Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\ExposesComponents.h">
+      <Filter>juicysfplugin\Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FilePickerFragment.h">
+      <Filter>juicysfplugin\Source</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\FilePicker.h">
       <Filter>juicysfplugin\Source</Filter>
     </ClInclude>
@@ -2334,9 +2340,6 @@
     <ClInclude Include="..\..\Source\MyColours.h">
       <Filter>juicysfplugin\Source</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Pill.h">
-      <Filter>juicysfplugin\Source</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Pills.h">
       <Filter>juicysfplugin\Source</Filter>
     </ClInclude>
@@ -2358,9 +2361,6 @@
     <ClInclude Include="..\..\Source\TableComponent.h">
       <Filter>juicysfplugin\Source</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\TableModel.h">
-      <Filter>juicysfplugin\Source</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\TablesComponent.h">
       <Filter>juicysfplugin\Source</Filter>
     </ClInclude>
diff --git a/Builds/VisualStudio2017/juicysfplugin_StandalonePlugin.vcxproj b/Builds/VisualStudio2017/juicysfplugin_StandalonePlugin.vcxproj
index 3ba62bb..45a78b3 100644
--- a/Builds/VisualStudio2017/juicysfplugin_StandalonePlugin.vcxproj
+++ b/Builds/VisualStudio2017/juicysfplugin_StandalonePlugin.vcxproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7C3AB9BE-365A-0EF7-AA2A-5B044FE497E5}</ProjectGuid>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
@@ -26,7 +26,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
                  Label="Configuration">
@@ -35,7 +35,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
@@ -46,7 +46,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -62,7 +62,7 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code</LibraryPath>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
diff --git a/Builds/VisualStudio2017/juicysfplugin_VST.vcxproj b/Builds/VisualStudio2017/juicysfplugin_VST.vcxproj
index a9a7663..e581e0f 100644
--- a/Builds/VisualStudio2017/juicysfplugin_VST.vcxproj
+++ b/Builds/VisualStudio2017/juicysfplugin_VST.vcxproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F47A6C45-0C65-BB36-F74E-BCCDF23F5ECA}</ProjectGuid>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
@@ -26,7 +26,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
                  Label="Configuration">
@@ -35,7 +35,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
@@ -46,7 +46,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -62,7 +62,7 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code</LibraryPath>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
diff --git a/Builds/VisualStudio2017/juicysfplugin_VST3.vcxproj b/Builds/VisualStudio2017/juicysfplugin_VST3.vcxproj
index 6afaf69..48f4069 100644
--- a/Builds/VisualStudio2017/juicysfplugin_VST3.vcxproj
+++ b/Builds/VisualStudio2017/juicysfplugin_VST3.vcxproj
@@ -16,7 +16,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{70A2C49A-5DF9-60C9-981B-D030ADE816BF}</ProjectGuid>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
@@ -26,7 +26,7 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
                  Label="Configuration">
@@ -35,7 +35,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
   <ImportGroup Label="ExtensionSettings"/>
@@ -46,7 +46,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -62,7 +62,7 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code</LibraryPath>
     <PlatformToolset>v141</PlatformToolset>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
diff --git a/juicysfplugin.jucer b/juicysfplugin.jucer
index 9fe6401..7948a68 100644
--- a/juicysfplugin.jucer
+++ b/juicysfplugin.jucer
@@ -6,11 +6,18 @@
               companyName="Birchlabs" companyWebsite="https://birchlabs.co.uk"
               bundleIdentifier="uk.co.birchlabs.juicysfplugin" pluginManufacturer="birchlabs"
               pluginCode="Jspf" pluginManufacturerCode="Blbs" pluginName="Juicy SF"
-              pluginDesc="Audio plugin to play soundfonts" id="ptvVfg" pluginFormats="buildAUv3,buildStandalone,buildVST,buildVST3"
+              pluginDesc="Audio plugin to play soundfonts" id="ptvVfg" pluginFormats="buildVST,buildVST3,buildAUv3,buildStandalone"
               pluginCharacteristicsValue="pluginIsSynth,pluginWantsMidiIn,pluginEditorRequiresKeys"
               buildVST="1" buildAU="0" buildRTAS="0" buildAAX="0" enableIAA="0">
   <MAINGROUP id="rCqBG3" name="juicysfplugin">
     <GROUP id="{ED7E27E3-B67D-383C-F819-F05289E08A33}" name="Source">
+      <FILE id="EiukEj" name="BankAndPreset.cpp" compile="1" resource="0"
+            file="Source/BankAndPreset.cpp"/>
+      <FILE id="lwGh9Y" name="BankAndPreset.h" compile="0" resource="0" file="Source/BankAndPreset.h"/>
+      <FILE id="nJTeqi" name="ExposesComponents.h" compile="0" resource="0"
+            file="Source/ExposesComponents.h"/>
+      <FILE id="aHqBtg" name="FilePickerFragment.h" compile="0" resource="0"
+            file="Source/FilePickerFragment.h"/>
       <FILE id="jhSsxG" name="FilePicker.cpp" compile="1" resource="0" file="Source/FilePicker.cpp"/>
       <FILE id="kDg5Qi" name="FilePicker.h" compile="0" resource="0" file="Source/FilePicker.h"/>
       <FILE id="xg2XPM" name="FluidSynthModel.cpp" compile="1" resource="0"
@@ -19,8 +26,6 @@
             file="Source/FluidSynthModel.h"/>
       <FILE id="olazZO" name="MyColours.cpp" compile="1" resource="0" file="Source/MyColours.cpp"/>
       <FILE id="RbaYg9" name="MyColours.h" compile="0" resource="0" file="Source/MyColours.h"/>
-      <FILE id="ZFYfhD" name="Pill.cpp" compile="1" resource="0" file="Source/Pill.cpp"/>
-      <FILE id="CBKk98" name="Pill.h" compile="0" resource="0" file="Source/Pill.h"/>
       <FILE id="esyv7j" name="Pills.cpp" compile="1" resource="0" file="Source/Pills.cpp"/>
       <FILE id="qlJw1C" name="Pills.h" compile="0" resource="0" file="Source/Pills.h"/>
       <FILE id="Q7V7pC" name="Preset.cpp" compile="1" resource="0" file="Source/Preset.cpp"/>
@@ -43,8 +48,6 @@
             file="Source/TableComponent.cpp"/>
       <FILE id="D2v6G2" name="TableComponent.h" compile="0" resource="0"
             file="Source/TableComponent.h"/>
-      <FILE id="DFpwRJ" name="TableModel.cpp" compile="1" resource="0" file="Source/TableModel.cpp"/>
-      <FILE id="iaUXIc" name="TableModel.h" compile="0" resource="0" file="Source/TableModel.h"/>
       <FILE id="XSCMOI" name="TablesComponent.cpp" compile="1" resource="0"
             file="Source/TablesComponent.cpp"/>
       <FILE id="m0tqZa" name="TablesComponent.h" compile="0" resource="0"
@@ -102,7 +105,7 @@
         <MODULEPATH id="juce_audio_utils" path="../../../../Applications/JUCE/modules"/>
       </MODULEPATHS>
     </CLION>
-    <VS2017 targetFolder="Builds/VisualStudio2017" vst3Folder="">
+    <VS2017 targetFolder="Builds/VisualStudio2017" vst3Folder="" windowsTargetPlatformVersion="10.0.17134.0">
       <CONFIGURATIONS>
         <CONFIGURATION isDebug="1" name="Debug"/>
         <CONFIGURATION isDebug="0" name="Release"/>