From 784a3defab2ce4211c82644672d8e939008bafb8 Mon Sep 17 00:00:00 2001
From: Hendrik Mennen <hmennen@protop-solutions.com>
Date: Sun, 19 Nov 2023 19:22:33 +0100
Subject: [PATCH] improve compile viewmodel

---
 OneWare.sln.DotSettings                       |   1 +
 src/OneWare.IceBreaker/IceBreakerFpga.cs      |  12 ++
 src/OneWare.IceBreaker/IceBreakerModule.cs    |   4 +-
 .../ViewModels/IceBreakerFpgaViewModel.cs     |  11 ++
 .../ViewModels/IceBreakerV10EViewModel.cs     |  11 --
 ...10EView.axaml => IceBreakerFpgaView.axaml} | 112 ++++++------
 ...w.axaml.cs => IceBreakerFpgaView.axaml.cs} |   4 +-
 .../OssCadSuiteIntegrationModule.cs           |   4 +-
 .../Yosys/YosysToolchain.cs                   |  83 ++++++++-
 .../Fpga/FpgaBase.cs                          |  37 ++++
 .../Fpga/FpgaNode.cs                          |  14 ++
 .../Fpga/FpgaPin.cs                           |  14 ++
 .../Fpga/IFpga.cs                             |   8 +
 .../Helpers/FpgaHelper.cs                     |  13 ++
 .../Models/FpgaModel.cs                       | 158 ++++++++++++++++
 .../Models/FpgaModelBase.cs                   | 169 ------------------
 .../Models/FpgaNodeModel.cs                   |  21 +++
 .../Models/FpgaPinModel.cs                    |  29 ++-
 .../Models/NodeModel.cs                       |  32 ----
 .../Models/UniversalFpgaProjectRoot.cs        |  18 +-
 .../Services/FpgaService.cs                   |  32 ++--
 .../Services/IFpgaToolchain.cs                |   8 +-
 .../Services/INodeProvider.cs                 |   4 +-
 .../Styles/Components.axaml                   |   4 +-
 .../UniversalFpgaProjectManager.cs            |  17 +-
 .../UniversalFpgaProjectCompileViewModel.cs   | 145 ++++++---------
 .../UniversalFpgaProjectToolBarViewModel.cs   |   2 +
 .../UniversalFpgaProjectCompileView.axaml     |  28 +--
 .../UniversalFpgaProjectToolBarView.axaml     |   4 +-
 src/OneWare.Vhdl/Parsing/VhdlNodeProvider.cs  |   9 +-
 30 files changed, 580 insertions(+), 428 deletions(-)
 create mode 100644 src/OneWare.IceBreaker/IceBreakerFpga.cs
 create mode 100644 src/OneWare.IceBreaker/ViewModels/IceBreakerFpgaViewModel.cs
 delete mode 100644 src/OneWare.IceBreaker/ViewModels/IceBreakerV10EViewModel.cs
 rename src/OneWare.IceBreaker/Views/{IceBreakerV10EView.axaml => IceBreakerFpgaView.axaml} (90%)
 rename src/OneWare.IceBreaker/Views/{IceBreakerV10EView.axaml.cs => IceBreakerFpgaView.axaml.cs} (56%)
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaBase.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaNode.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaPin.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Fpga/IFpga.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Helpers/FpgaHelper.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModel.cs
 delete mode 100644 src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs
 create mode 100644 src/OneWare.UniversalFpgaProjectSystem/Models/FpgaNodeModel.cs
 delete mode 100644 src/OneWare.UniversalFpgaProjectSystem/Models/NodeModel.cs

diff --git a/OneWare.sln.DotSettings b/OneWare.sln.DotSettings
index c831a3cb..9b25ace2 100644
--- a/OneWare.sln.DotSettings
+++ b/OneWare.sln.DotSettings
@@ -3,5 +3,6 @@
 	
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=dockable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Foldings/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fpgas/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=netlistsvg/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=verible/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/OneWare.IceBreaker/IceBreakerFpga.cs b/src/OneWare.IceBreaker/IceBreakerFpga.cs
new file mode 100644
index 00000000..b17e1c72
--- /dev/null
+++ b/src/OneWare.IceBreaker/IceBreakerFpga.cs
@@ -0,0 +1,12 @@
+using OneWare.UniversalFpgaProjectSystem.Fpga;
+using OneWare.UniversalFpgaProjectSystem.Models;
+
+namespace OneWare.IceBreaker;
+
+public class IceBreakerFpga : FpgaBase
+{
+    public IceBreakerFpga()
+    {
+        LoadFromJson("avares://OneWare.IceBreaker/Assets/IceBreakerV1.0e.json");
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.IceBreaker/IceBreakerModule.cs b/src/OneWare.IceBreaker/IceBreakerModule.cs
index b58ab346..9094c00d 100644
--- a/src/OneWare.IceBreaker/IceBreakerModule.cs
+++ b/src/OneWare.IceBreaker/IceBreakerModule.cs
@@ -15,6 +15,8 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
 
     public void OnInitialized(IContainerProvider containerProvider)
     {
-        containerProvider.Resolve<FpgaService>().AddFpga<IceBreakerV10EViewModel>();
+        var fpga = new IceBreakerFpga();
+        containerProvider.Resolve<FpgaService>().RegisterFpga(fpga);
+        containerProvider.Resolve<FpgaService>().RegisterCustomFpgaModel<IceBreakerFpgaViewModel>(fpga);
     }
 }
\ No newline at end of file
diff --git a/src/OneWare.IceBreaker/ViewModels/IceBreakerFpgaViewModel.cs b/src/OneWare.IceBreaker/ViewModels/IceBreakerFpgaViewModel.cs
new file mode 100644
index 00000000..c218091f
--- /dev/null
+++ b/src/OneWare.IceBreaker/ViewModels/IceBreakerFpgaViewModel.cs
@@ -0,0 +1,11 @@
+using OneWare.UniversalFpgaProjectSystem.Models;
+
+namespace OneWare.IceBreaker.ViewModels;
+
+public class IceBreakerFpgaViewModel : FpgaModel
+{
+    public IceBreakerFpgaViewModel(IceBreakerFpga fpga) : base(fpga)
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.IceBreaker/ViewModels/IceBreakerV10EViewModel.cs b/src/OneWare.IceBreaker/ViewModels/IceBreakerV10EViewModel.cs
deleted file mode 100644
index 68e34ceb..00000000
--- a/src/OneWare.IceBreaker/ViewModels/IceBreakerV10EViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using OneWare.UniversalFpgaProjectSystem.Models;
-
-namespace OneWare.IceBreaker.ViewModels;
-
-public class IceBreakerV10EViewModel : FpgaModelBase
-{
-    public IceBreakerV10EViewModel()
-    {
-        LoadFromJson("avares://OneWare.IceBreaker/Assets/IceBreakerV1.0e.json");
-    }
-}
\ No newline at end of file
diff --git a/src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml b/src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml
similarity index 90%
rename from src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml
rename to src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml
index 54ef49da..bb9ebb74 100644
--- a/src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml
+++ b/src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml
@@ -6,7 +6,7 @@
              mc:Ignorable="d"
              d:DesignHeight="500"
              d:DesignWidth="1000"
-             x:Class="OneWare.IceBreaker.Views.IceBreakerV10EView" x:DataType="viewModels:IceBreakerV10EViewModel"
+             x:Class="OneWare.IceBreaker.Views.IceBreakerFpgaView" x:DataType="viewModels:IceBreakerFpgaViewModel"
              x:CompileBindings="True">
 
     <UserControl.Styles>
@@ -64,12 +64,12 @@
         <Image Grid.Row="1" Grid.Column="0" Source="{DynamicResource Entypo+.ArrowLongRight}" Margin="0, 20, 2, 0"
                Height="20"
                Width="20" HorizontalAlignment="Right" VerticalAlignment="Center" />
-        <Button Grid.Row="1" Grid.Column="0" DataContext="{Binding Pins[9]}" Classes="Connectable"
+        <Button Grid.Row="1" Grid.Column="0" DataContext="{Binding PinModels[9]}" Classes="Connectable"
                 HorizontalAlignment="Right" VerticalAlignment="Center" Height="17" Width="24" Background="Blue"
                 BorderBrush="{DynamicResource ThemeBorderLowBrush}" BorderThickness="1" Margin="0, 0, 22, 20"
                 Content="TX"
                 Foreground="White" />
-        <Button Grid.Row="1" Grid.Column="0" DataContext="{Binding Pins[6]}" Classes="Connectable"
+        <Button Grid.Row="1" Grid.Column="0" DataContext="{Binding PinModels[6]}" Classes="Connectable"
                 HorizontalAlignment="Right" VerticalAlignment="Center" Height="17" Width="24" Background="Red"
                 BorderBrush="{DynamicResource ThemeBorderLowBrush}" BorderThickness="1" Margin="0, 20, 22, 0"
                 Content="RX"
@@ -99,7 +99,7 @@
                            Margin="0, 0, 90,0" Text="FPGA" IsHitTestVisible="False" Width="45" TextAlignment="Center" />
                 <TextBlock Foreground="White" VerticalAlignment="Top" Padding="0" HorizontalAlignment="Left"
                            Margin="20, 30, 0,0" Text="CLK" />
-                <Button DataContext="{Binding Pins[35]}" Classes="Connectable" Background="Black"
+                <Button DataContext="{Binding PinModels[35]}" Classes="Connectable" Background="Black"
                         Width="15" Height="12" VerticalAlignment="Top" Padding="0" HorizontalAlignment="Left"
                         Margin="24, 44, 0, 0" />
 
@@ -121,7 +121,7 @@
 
                 <Rectangle Fill="Gray" Width="14" Height="20" HorizontalAlignment="Left" VerticalAlignment="Bottom"
                            Margin="1, 0, 0, 40" />
-                <Button DataContext="{Binding Pins[10]}" Classes="Connectable" Background="#ffcc66"
+                <Button DataContext="{Binding PinModels[10]}" Classes="Connectable" Background="#ffcc66"
                         Width="10" Height="14" HorizontalAlignment="Left" VerticalAlignment="Bottom"
                         Margin="3, 0, 0, 43" />
 
@@ -130,11 +130,11 @@
 
                 <Button Background="Lime" Width="12" Height="10" VerticalAlignment="Bottom"
                         HorizontalAlignment="Left" Margin="25, 0, 0, 51" Classes="Connectable"
-                        DataContext="{Binding Pins[37]}" />
+                        DataContext="{Binding PinModels[37]}" />
 
                 <Button Background="Red" Width="12" Height="10" VerticalAlignment="Bottom"
                         HorizontalAlignment="Left" Margin="25, 0, 0, 39" Classes="Connectable"
-                        DataContext="{Binding Pins[11]}" />
+                        DataContext="{Binding PinModels[11]}" />
 
                 <Grid HorizontalAlignment="Right" VerticalAlignment="Center" RowDefinitions="12, 12, 12, 12, 12, 12"
                       ColumnDefinitions="30,12,12,4" Margin="0, 0, 0, 0">
@@ -146,24 +146,24 @@
                     <TextBlock Grid.Row="4" Text="GND" Foreground="White" />
                     <TextBlock Grid.Row="5" Text="3.3V" Foreground="White" />-->
 
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[27]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[27]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding Pins[25]}"
+                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding PinModels[25]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding Pins[21]}"
+                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding PinModels[21]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding Pins[19]}"
+                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding PinModels[19]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="1" Background="#F97063" IsEnabled="False" />
 
-                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding Pins[26]}"
+                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding PinModels[26]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding Pins[23]}"
+                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding PinModels[23]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding Pins[20]}"
+                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding PinModels[20]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding Pins[18]}"
+                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding PinModels[18]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="2" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="2" Background="#F97063" IsEnabled="False" />
@@ -180,24 +180,24 @@
                 <Grid Classes="VertRight" HorizontalAlignment="Center" VerticalAlignment="Top"
                       RowDefinitions="12, 12, 12, 12, 12, 12"
                       ColumnDefinitions="0,12,12,0" Margin="0, -20, 120, 0">
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[4]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[4]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding Pins[2]}"
+                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding PinModels[2]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding Pins[47]}"
+                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding PinModels[47]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding Pins[45]}"
+                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding PinModels[45]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="1" Background="#F97063" IsEnabled="False" />
 
-                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding Pins[3]}"
+                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding PinModels[3]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding Pins[48]}"
+                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding PinModels[48]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding Pins[46]}"
+                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding PinModels[46]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding Pins[44]}"
+                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding PinModels[44]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="2" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="2" Background="#F97063" IsEnabled="False" />
@@ -213,24 +213,24 @@
                 <Grid Classes="VertRight" HorizontalAlignment="Center" VerticalAlignment="Top"
                       RowDefinitions="12, 12, 12, 12, 12, 12"
                       ColumnDefinitions="0,12,12,0" Margin="120, -20, 0, 0">
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[43]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[43]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding Pins[38]}"
+                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding PinModels[38]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding Pins[34]}"
+                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding PinModels[34]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding Pins[31]}"
+                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding PinModels[31]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="1" Background="#F97063" IsEnabled="False" />
 
-                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding Pins[42]}"
+                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding PinModels[42]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding Pins[36]}"
+                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding PinModels[36]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding Pins[32]}"
+                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding PinModels[32]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding Pins[28]}"
+                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding PinModels[28]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="2" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="2" Background="#F97063" IsEnabled="False" />
@@ -239,15 +239,15 @@
                 <Grid Classes="VertRight" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                       RowDefinitions="12, 12, 12, 12"
                       ColumnDefinitions="0,12,12,0" Margin="0, 0, 120, -8">
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[40]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[40]}"
                             Classes="Connectable" />
                     <Button Grid.Row="1" Grid.Column="1" Background="#F97063" IsEnabled="False" />
                     <Button Grid.Row="2" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="3" Grid.Column="1" Background="#F97063" IsEnabled="False" />
 
-                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding Pins[39]}"
+                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding PinModels[39]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding Pins[41]}"
+                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding PinModels[41]}"
                             Classes="Connectable" />
                     <Button Grid.Row="2" Grid.Column="2" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="3" Grid.Column="2" Background="#F97063" IsEnabled="False" />
@@ -256,17 +256,17 @@
                 <Grid Classes="VertRight" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                       RowDefinitions="12, 12, 12, 12, 12, 12, 12"
                       ColumnDefinitions="0,12,0" Margin="100, 0, 0, -31">
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[16]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[16]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding Pins[15]}"
+                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding PinModels[15]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding Pins[17]}"
+                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding PinModels[17]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding Pins[14]}"
+                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding PinModels[14]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="4" Grid.Column="1" DataContext="{Binding Pins[12]}"
+                    <Button Grid.Row="4" Grid.Column="1" DataContext="{Binding PinModels[12]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="5" Grid.Column="1" DataContext="{Binding Pins[13]}"
+                    <Button Grid.Row="5" Grid.Column="1" DataContext="{Binding PinModels[13]}"
                             Classes="Connectable" />
                     <Button Grid.Row="6" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                 </Grid>
@@ -291,18 +291,18 @@
                 <Ellipse Fill="{DynamicResource ThemeBackgroundBrush}" Height="16" Width="16"
                          VerticalAlignment="Center"
                          HorizontalAlignment="Center" Margin="0 0 0 70" />
-                <Button DataContext="{Binding Pins[23]}" Classes="Connectable" Background="Lime"
+                <Button DataContext="{Binding PinModels[23]}" Classes="Connectable" Background="Lime"
                         Width="14" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Margin="0 -30 0 0" />
-                <Button DataContext="{Binding Pins[27]}" Classes="Connectable" Background="Lime"
+                <Button DataContext="{Binding PinModels[27]}" Classes="Connectable" Background="Lime"
                         Width="10" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Margin="0 0 30 0" />
-                <Button DataContext="{Binding Pins[26]}" Classes="Connectable" Background="Red"
+                <Button DataContext="{Binding PinModels[26]}" Classes="Connectable" Background="Red"
                         Width="10" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                <Button DataContext="{Binding Pins[25]}" Classes="Connectable" Background="Lime"
+                <Button DataContext="{Binding PinModels[25]}" Classes="Connectable" Background="Lime"
                         Width="10" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Margin="30 0 0 0" />
-                <Button DataContext="{Binding Pins[21]}" Classes="Connectable" Background="Lime"
+                <Button DataContext="{Binding PinModels[21]}" Classes="Connectable" Background="Lime"
                         Width="14" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center"
                         Margin="0 30 0 0" />
                 <Ellipse Fill="{DynamicResource ThemeBackgroundBrush}" Height="16" Width="16"
@@ -311,17 +311,17 @@
 
                 <Rectangle Fill="Gray" Width="20" Height="14" HorizontalAlignment="Right" VerticalAlignment="Center"
                            Margin="0, 0, 4, 70" />
-                <Button DataContext="{Binding Pins[20]}" Classes="Connectable" Background="#ffcc66"
+                <Button DataContext="{Binding PinModels[20]}" Classes="Connectable" Background="#ffcc66"
                         Width="14" Height="10" HorizontalAlignment="Right" VerticalAlignment="Center"
                         Margin="0 0 7 70" />
                 <Rectangle Fill="Gray" Width="20" Height="14" HorizontalAlignment="Right" VerticalAlignment="Center"
                            Margin="0, 0, 4, 0" />
-                <Button DataContext="{Binding Pins[19]}" Classes="Connectable" Background="#ffcc66"
+                <Button DataContext="{Binding PinModels[19]}" Classes="Connectable" Background="#ffcc66"
                         Width="14" Height="10" HorizontalAlignment="Right" VerticalAlignment="Center"
                         Margin="0 0 7 0" />
                 <Rectangle Fill="Gray" Width="20" Height="14" HorizontalAlignment="Right" VerticalAlignment="Center"
                            Margin="0, 70, 4, 0" />
-                <Button DataContext="{Binding Pins[18]}" Classes="Connectable" Background="#ffcc66"
+                <Button DataContext="{Binding PinModels[18]}" Classes="Connectable" Background="#ffcc66"
                         Width="14" Height="10" HorizontalAlignment="Right" VerticalAlignment="Center"
                         Margin="0 70 7 0" />
 
@@ -335,24 +335,24 @@
                     <TextBlock Grid.Row="4" Text="GND" Foreground="White" />
                     <TextBlock Grid.Row="5" Text="3.3V" Foreground="White" />-->
 
-                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding Pins[26]}"
+                    <Button Grid.Row="0" Grid.Column="1" DataContext="{Binding PinModels[26]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding Pins[23]}"
+                    <Button Grid.Row="1" Grid.Column="1" DataContext="{Binding PinModels[23]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding Pins[20]}"
+                    <Button Grid.Row="2" Grid.Column="1" DataContext="{Binding PinModels[20]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding Pins[18]}"
+                    <Button Grid.Row="3" Grid.Column="1" DataContext="{Binding PinModels[18]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="1" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="1" Background="#F97063" IsEnabled="False" />
 
-                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding Pins[27]}"
+                    <Button Grid.Row="0" Grid.Column="2" DataContext="{Binding PinModels[27]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding Pins[25]}"
+                    <Button Grid.Row="1" Grid.Column="2" DataContext="{Binding PinModels[25]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding Pins[21]}"
+                    <Button Grid.Row="2" Grid.Column="2" DataContext="{Binding PinModels[21]}"
                             Classes="Connectable" />
-                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding Pins[19]}"
+                    <Button Grid.Row="3" Grid.Column="2" DataContext="{Binding PinModels[19]}"
                             Classes="Connectable" />
                     <Button Grid.Row="4" Grid.Column="2" Background="#0094FF" IsEnabled="False" />
                     <Button Grid.Row="5" Grid.Column="2" Background="#F97063" IsEnabled="False" />
diff --git a/src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml.cs b/src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml.cs
similarity index 56%
rename from src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml.cs
rename to src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml.cs
index 75cd61d2..b465653f 100644
--- a/src/OneWare.IceBreaker/Views/IceBreakerV10EView.axaml.cs
+++ b/src/OneWare.IceBreaker/Views/IceBreakerFpgaView.axaml.cs
@@ -2,9 +2,9 @@
 
 namespace OneWare.IceBreaker.Views;
 
-public partial class IceBreakerV10EView : UserControl
+public partial class IceBreakerFpgaView : UserControl
 {
-    public IceBreakerV10EView()
+    public IceBreakerFpgaView()
     {
         InitializeComponent();
     }
diff --git a/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs b/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs
index a1547229..c252e8c5 100644
--- a/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs
+++ b/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs
@@ -23,8 +23,8 @@ public void OnInitialized(IContainerProvider containerProvider)
     {
         var settingsService = containerProvider.Resolve<ISettingsService>();
         var yosysService = containerProvider.Resolve<YosysService>();
-        
-        containerProvider.Resolve<FpgaService>().FpgaToolchains.Add(new YosysToolchain());
+
+        containerProvider.Resolve<FpgaService>().RegisterToolchain<YosysToolchain>();
         
         settingsService.RegisterTitledPath("Tools", "OSS Cad Suite", "OssCadSuite_Path", "OSS CAD Suite Path", 
             "Sets the path for the Yosys OSS CAD Suite", "", null, null, IsOssPathValid);
diff --git a/src/OneWare.OssCadSuiteIntegration/Yosys/YosysToolchain.cs b/src/OneWare.OssCadSuiteIntegration/Yosys/YosysToolchain.cs
index b286eb0e..9679c60a 100644
--- a/src/OneWare.OssCadSuiteIntegration/Yosys/YosysToolchain.cs
+++ b/src/OneWare.OssCadSuiteIntegration/Yosys/YosysToolchain.cs
@@ -1,5 +1,7 @@
-using OneWare.UniversalFpgaProjectSystem.Models;
+using OneWare.Shared.Services;
+using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Services;
+using Prism.Ioc;
 
 namespace OneWare.OssCadSuiteIntegration.Yosys;
 
@@ -7,18 +9,89 @@ public class YosysToolchain : IFpgaToolchain
 {
     public string Name => "Yosys";
     
-    public void LoadConnections()
+    public void LoadConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)
     {
-        
+        try
+        {
+            var files = Directory.GetFiles(project.RootFolderPath);
+            var pcfPath = files.FirstOrDefault(x => Path.GetExtension(x) == ".pcf");
+            if (pcfPath != null)
+            {
+                var pcf = File.ReadAllText(pcfPath);
+                var lines = pcf.Split('\n');
+                foreach (var line in lines)
+                {
+                    var trimmedLine = line.Trim();
+                    if (trimmedLine.StartsWith("set_io"))
+                    {
+                        var parts = trimmedLine.Split(' ');
+                        if (parts.Length != 3)
+                        {
+                            ContainerLocator.Container.Resolve<ILogger>().Warning("PCF Line invalid: " + trimmedLine);
+                            continue;
+                        }
+
+                        var signal = parts[1];
+                        var pin = parts[2];
+
+                        if (fpga.PinModels.TryGetValue(pin, out var pinModel) && fpga.NodeModels.TryGetValue(signal, out var signalModel))
+                        {
+                            fpga.Connect(pinModel, signalModel);
+                        } 
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            ContainerLocator.Container.Resolve<ILogger>().Error(e.Message, e);
+        }
     }
 
-    public void SaveConnections()
+    public void SaveConnections(UniversalFpgaProjectRoot project, FpgaModel fpga)
     {
-        
+        var pcfPath = Path.Combine(project.FullPath, "project.pcf");
+
+        try
+        {
+            var pcf = "";
+            if (File.Exists(pcfPath))
+            {
+                var existingPcf = File.ReadAllText(pcfPath);
+                existingPcf = RemoveLine(existingPcf, "set_io");
+                pcf = existingPcf.Trim();
+            }
+
+            foreach (var conn in fpga.PinModels.Where(x => x.Value.Connection is not null))
+            {
+                pcf += $"\nset_io {conn.Value.Connection!.FpgaNode.Name} {conn.Value.Pin.Name}";
+            }
+            pcf = pcf.Trim() + '\n';
+            
+            File.WriteAllText(pcfPath, pcf);
+        }
+        catch (Exception e)
+        {
+            ContainerLocator.Container.Resolve<ILogger>().Error(e.Message, e);
+        }
     }
 
     public void StartCompile()
     {
         
     }
+    
+    private string RemoveLine(string file, string find)
+    {
+        var startIndex = file.IndexOf(find, StringComparison.Ordinal);
+        while (startIndex > -1)
+        {
+            var endIndex = file.IndexOf('\n', startIndex);
+            if (endIndex == -1) endIndex = file.Length - 1;
+            file = file.Remove(startIndex, endIndex - startIndex + 1);
+            startIndex = file.IndexOf(find, startIndex, StringComparison.Ordinal);
+        }
+
+        return file;
+    }
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaBase.cs b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaBase.cs
new file mode 100644
index 00000000..4f08b905
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaBase.cs
@@ -0,0 +1,37 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using Avalonia.Platform;
+
+namespace OneWare.UniversalFpgaProjectSystem.Fpga;
+
+public abstract class FpgaBase : IFpga
+{
+    private static readonly JsonSerializerOptions SerializerOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        AllowTrailingCommas = true
+    };
+
+    public string Name { get; private set; } = "Unknown";
+
+    public IList<FpgaPin> Pins { get; } = new List<FpgaPin>();
+    
+    protected void LoadFromJson(string path)
+    {
+        var stream = AssetLoader.Open(new Uri(path));
+        
+        var properties = JsonSerializer.Deserialize<JsonObject>(stream, SerializerOptions);
+        
+        Name = properties?["Name"]?.ToString() ?? "Unknown";
+
+        foreach (var jsonNode in properties["Pins"].AsArray())
+        {
+            var description = jsonNode["Description"].ToString();
+            var name = jsonNode["Name"].ToString();
+            
+            Pins.Add(new FpgaPin(name, description));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaNode.cs b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaNode.cs
new file mode 100644
index 00000000..cf8d7e87
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaNode.cs
@@ -0,0 +1,14 @@
+namespace OneWare.UniversalFpgaProjectSystem.Fpga;
+
+public class FpgaNode
+{
+    public string Name { get; }
+    
+    public string Direction { get; }
+
+    public FpgaNode(string name, string direction)
+    {
+        Name = name;
+        Direction = direction;
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaPin.cs b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaPin.cs
new file mode 100644
index 00000000..2adf0932
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Fpga/FpgaPin.cs
@@ -0,0 +1,14 @@
+namespace OneWare.UniversalFpgaProjectSystem.Fpga;
+
+public class FpgaPin
+{
+    public string Name { get; }
+    
+    public string? Description { get; }
+
+    public FpgaPin(string name, string? description)
+    {
+        Name = name;
+        Description = description;
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Fpga/IFpga.cs b/src/OneWare.UniversalFpgaProjectSystem/Fpga/IFpga.cs
new file mode 100644
index 00000000..6f356a24
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Fpga/IFpga.cs
@@ -0,0 +1,8 @@
+namespace OneWare.UniversalFpgaProjectSystem.Fpga;
+
+public interface IFpga
+{
+    public string Name { get; }
+    
+    public IList<FpgaPin> Pins { get; }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Helpers/FpgaHelper.cs b/src/OneWare.UniversalFpgaProjectSystem/Helpers/FpgaHelper.cs
new file mode 100644
index 00000000..31783882
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Helpers/FpgaHelper.cs
@@ -0,0 +1,13 @@
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using Avalonia.Platform;
+using NodeEditor.Controls;
+using OneWare.UniversalFpgaProjectSystem.Models;
+
+namespace OneWare.UniversalFpgaProjectSystem.Helpers;
+
+public class FpgaHelper
+{
+  
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModel.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModel.cs
new file mode 100644
index 00000000..90a6fd1b
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModel.cs
@@ -0,0 +1,158 @@
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using DynamicData.Binding;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
+
+namespace OneWare.UniversalFpgaProjectSystem.Models;
+
+public class FpgaModel : ObservableObject
+{
+    public IFpga Fpga { get; }
+    
+    public Dictionary<string, FpgaPinModel> PinModels { get; } = new();
+    public ObservableCollection<FpgaPinModel> VisiblePinModels { get; } = new();
+    public Dictionary<string, FpgaNodeModel> NodeModels { get; } = new();
+    public ObservableCollection<FpgaNodeModel> VisibleNodeModels { get; } = new();
+    
+    
+    private FpgaPinModel? _selectedPinModel;
+    public FpgaPinModel? SelectedPinModel
+    {
+        get => _selectedPinModel;
+        set => SetProperty(ref _selectedPinModel, value);
+    }
+
+    private FpgaNodeModel? _selectedNodeModel;
+    public FpgaNodeModel? SelectedNodeModel
+    {
+        get => _selectedNodeModel;
+        set => SetProperty(ref _selectedNodeModel, value);
+    }
+
+    public RelayCommand ConnectCommand { get; }
+    
+    public RelayCommand DisconnectCommand { get; }
+
+    private string _searchTextPins = string.Empty;
+
+    public string SearchTextPins
+    {
+        get => _searchTextPins;
+        set => SetProperty(ref _searchTextPins, value);
+    }
+    
+    private string _searchTextNodes = string.Empty;
+
+    public string SearchTextNodes
+    {
+        get => _searchTextNodes;
+        set => SetProperty(ref _searchTextNodes, value);
+    }
+
+    public event EventHandler? NodeConnected;
+
+    public event EventHandler? NodeDisconnected;
+
+    protected FpgaModel(IFpga fpga)
+    {
+        Fpga = fpga;
+
+        foreach (var pin in fpga.Pins)
+        {
+            AddPin(pin);
+        }
+        
+        ConnectCommand = new RelayCommand(ConnectSelected, () => SelectedNodeModel is { Connection: null } 
+                                                                 && SelectedPinModel is { Connection :null });
+        
+        DisconnectCommand = new RelayCommand(DisconnectSelected, () => SelectedPinModel is {Connection: not null});
+
+        this.WhenValueChanged(x => x.SelectedNodeModel).Subscribe(_ =>
+        {
+            ConnectCommand.NotifyCanExecuteChanged();
+            DisconnectCommand.NotifyCanExecuteChanged();
+        });
+        
+        this.WhenValueChanged(x => x.SelectedPinModel).Subscribe(_ =>
+        {
+            ConnectCommand.NotifyCanExecuteChanged();
+            DisconnectCommand.NotifyCanExecuteChanged();
+        });
+
+        this.WhenValueChanged(x => x.SearchTextPins).Subscribe(SearchPins);
+        this.WhenValueChanged(x => x.SearchTextNodes).Subscribe(SearchNodes);
+    }
+
+    private void SearchPins(string? search)
+    {
+        if (string.IsNullOrWhiteSpace(search))
+        {
+            SelectedPinModel = null;
+            return;
+        }
+
+        SelectedPinModel = VisiblePinModels.FirstOrDefault(x => x.Pin.Name.Contains(search, StringComparison.OrdinalIgnoreCase) 
+                                                      || (x.Pin.Description?.Contains(search, StringComparison.OrdinalIgnoreCase) ?? false));
+    }
+
+    private void SearchNodes(string? search)
+    {
+        if (string.IsNullOrWhiteSpace(search))
+        {
+            SelectedNodeModel = null;
+            return;
+        }
+
+        SelectedNodeModel = VisibleNodeModels.FirstOrDefault(x => x.FpgaNode.Name.Contains(search, StringComparison.OrdinalIgnoreCase));
+    }
+
+    public void Connect(FpgaPinModel pin, FpgaNodeModel fpgaNode)
+    {
+        pin.Connection = fpgaNode;
+        fpgaNode.Connection = pin;
+        ConnectCommand.NotifyCanExecuteChanged();
+        DisconnectCommand.NotifyCanExecuteChanged();
+        NodeConnected?.Invoke(this, EventArgs.Empty);
+    }
+
+    public void Disconnect(FpgaPinModel pin)
+    {
+        if (pin.Connection != null) pin.Connection.Connection = null;
+        pin.Connection = null;
+        ConnectCommand.NotifyCanExecuteChanged();
+        DisconnectCommand.NotifyCanExecuteChanged();
+        NodeDisconnected?.Invoke(this, EventArgs.Empty);
+    }
+    
+    private void ConnectSelected()
+    {
+        if (SelectedPinModel is null || SelectedNodeModel is null) return;
+        Connect(SelectedPinModel, SelectedNodeModel);
+    }
+
+    private void DisconnectSelected()
+    {
+        if (SelectedPinModel is null) return;
+        Disconnect(SelectedPinModel);
+    }
+
+    public void SelectPin(FpgaPinModel pinModel)
+    {
+        SelectedPinModel = pinModel;
+    }
+
+    private void AddPin(FpgaPin pin)
+    {
+        var model = new FpgaPinModel(pin, this);
+        PinModels.Add(pin.Name, model);
+        VisiblePinModels.Add(model);
+    }
+    
+    public void AddNode(FpgaNode node)
+    {
+        var model = new FpgaNodeModel(node);
+        NodeModels.Add(node.Name, model);
+        VisibleNodeModels.Add(model);
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs
deleted file mode 100644
index 134bc128..00000000
--- a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaModelBase.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-using Avalonia.Platform;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using DynamicData;
-using DynamicData.Binding;
-
-namespace OneWare.UniversalFpgaProjectSystem.Models;
-
-public abstract class FpgaModelBase : ObservableObject
-{
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        AllowTrailingCommas = true
-    };
-    
-    public Dictionary<string, FpgaPinModel> Pins { get; } = new();
-    public ObservableCollection<FpgaPinModel> VisiblePins { get; } = new();
-
-    public Dictionary<string, NodeModel> Nodes { get; } = new();
-    public ObservableCollection<NodeModel> VisibleNodes { get; } = new();
-    
-    
-    private FpgaPinModel? _selectedPin;
-    public FpgaPinModel? SelectedPin
-    {
-        get => _selectedPin;
-        set => SetProperty(ref _selectedPin, value);
-    }
-
-    private NodeModel? _selectedNode;
-    public NodeModel? SelectedNode
-    {
-        get => _selectedNode;
-        set => SetProperty(ref _selectedNode, value);
-    }
-
-    public string Name { get; private set; } = "Unknown";
-
-    public RelayCommand ConnectCommand { get; }
-    
-    public RelayCommand DisconnectCommand { get; }
-
-    private string _searchTextPins = string.Empty;
-
-    public string SearchTextPins
-    {
-        get => _searchTextPins;
-        set => SetProperty(ref _searchTextPins, value);
-    }
-    
-    private string _searchTextNodes = string.Empty;
-
-    public string SearchTextNodes
-    {
-        get => _searchTextNodes;
-        set => SetProperty(ref _searchTextNodes, value);
-    }
-
-    public event EventHandler? NodeConnected;
-
-    public event EventHandler? NodeDisconnected;
-    
-    public FpgaModelBase()
-    {
-        ConnectCommand = new RelayCommand(ConnectSelected, () => SelectedNode is { Connection: null } 
-                                                                 && SelectedPin is { Connection :null });
-        
-        DisconnectCommand = new RelayCommand(DisconnectSelected, () => SelectedPin is {Connection: not null});
-
-        this.WhenValueChanged(x => x.SelectedNode).Subscribe(x =>
-        {
-            ConnectCommand.NotifyCanExecuteChanged();
-            DisconnectCommand.NotifyCanExecuteChanged();
-        });
-        
-        this.WhenValueChanged(x => x.SelectedPin).Subscribe(x =>
-        {
-            ConnectCommand.NotifyCanExecuteChanged();
-            DisconnectCommand.NotifyCanExecuteChanged();
-        });
-
-        this.WhenValueChanged(x => x.SearchTextPins).Subscribe(SearchPins);
-        this.WhenValueChanged(x => x.SearchTextNodes).Subscribe(SearchNodes);
-
-    }
-
-    private void SearchPins(string? search)
-    {
-        if (string.IsNullOrWhiteSpace(search))
-        {
-            SelectedPin = null;
-            return;
-        }
-
-        SelectedPin = VisiblePins.FirstOrDefault(x => x.Name.Contains(search, StringComparison.OrdinalIgnoreCase) 
-                                                      || x.Description.Contains(search, StringComparison.OrdinalIgnoreCase));
-    }
-
-    private void SearchNodes(string? search)
-    {
-        if (string.IsNullOrWhiteSpace(search))
-        {
-            SelectedNode = null;
-            return;
-        }
-
-        SelectedNode = VisibleNodes.FirstOrDefault(x => x.Name.Contains(search, StringComparison.OrdinalIgnoreCase));
-    }
-
-    public void Connect(FpgaPinModel pin, NodeModel node)
-    {
-        pin.Connection = SelectedNode;
-        node.Connection = SelectedPin;
-        ConnectCommand.NotifyCanExecuteChanged();
-        DisconnectCommand.NotifyCanExecuteChanged();
-        NodeConnected?.Invoke(this, EventArgs.Empty);
-    }
-
-    public void Disconnect(FpgaPinModel pin)
-    {
-        if (pin.Connection != null) pin.Connection.Connection = null;
-        pin.Connection = null;
-        ConnectCommand.NotifyCanExecuteChanged();
-        DisconnectCommand.NotifyCanExecuteChanged();
-        NodeDisconnected?.Invoke(this, EventArgs.Empty);
-    }
-    
-    private void ConnectSelected()
-    {
-        if (SelectedPin is null || SelectedNode is null) return;
-        Connect(SelectedPin, SelectedNode);
-    }
-
-    private void DisconnectSelected()
-    {
-        if (SelectedPin is null) return;
-        Disconnect(SelectedPin);
-    }
-
-    protected void LoadFromJson(string path)
-    {
-        var stream = AssetLoader.Open(new Uri(path));
-        
-        var properties = JsonSerializer.Deserialize<JsonObject>(stream, SerializerOptions);
-        
-        Name = properties?["Name"]?.ToString() ?? "Unknown";
-
-        foreach (var jsonNode in properties["Pins"].AsArray())
-        {
-            var description = jsonNode["Description"].ToString();
-            var name = jsonNode["Name"].ToString();
-
-            var pin = new FpgaPinModel(name, description, this);
-            Pins.Add(name, pin);
-            VisiblePins.Add(pin);
-        }
-    }
-
-    public void SelectPin(FpgaPinModel model)
-    {
-        SelectedPin = model;
-    }
-}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaNodeModel.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaNodeModel.cs
new file mode 100644
index 00000000..f8625e30
--- /dev/null
+++ b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaNodeModel.cs
@@ -0,0 +1,21 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
+
+namespace OneWare.UniversalFpgaProjectSystem.Models;
+
+public class FpgaNodeModel : ObservableObject
+{
+    public FpgaNode FpgaNode { get; }
+    
+    private FpgaPinModel? _connection;
+    public FpgaPinModel? Connection
+    {
+        get => _connection;
+        set => SetProperty(ref _connection, value);
+    }
+
+    public FpgaNodeModel(FpgaNode fpgaNode)
+    {
+        FpgaNode = fpgaNode;
+    }
+}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaPinModel.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaPinModel.cs
index f3822daf..d8d9dfeb 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaPinModel.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/Models/FpgaPinModel.cs
@@ -1,19 +1,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
 
 namespace OneWare.UniversalFpgaProjectSystem.Models;
 
 public class FpgaPinModel : ObservableObject
 {
-    public FpgaModelBase Parent { get; }
-    public string Name { get; }
-
-    private string _description;
-    public string Description
-    {
-        get => _description;
-        set => SetProperty(ref _description, value);
-    }
-
+    public FpgaPin Pin { get; }
+    public FpgaModel Parent { get; }
+    
     private string _toolTipText;
     public string ToolTipText
     {
@@ -21,23 +15,22 @@ public string ToolTipText
         set => SetProperty(ref _toolTipText, value);
     }
     
-    private NodeModel? _connection;
-    public NodeModel? Connection
+    private FpgaNodeModel? _connection;
+    public FpgaNodeModel? Connection
     {
         get => _connection;
         set
         {
             this.SetProperty(ref _connection, value);
-            if (_connection == null) ToolTipText = "Click to connect " + Name;
-            else ToolTipText = Name + " is connected with " + _connection.Name;
+            if (_connection == null) ToolTipText = "Click to connect " + Pin.Name;
+            else ToolTipText = Pin.Name + " is connected with " + _connection.FpgaNode.Name;
         }
     }
     
-    public FpgaPinModel(string name, string description, FpgaModelBase parent)
+    public FpgaPinModel(FpgaPin pin, FpgaModel parent)
     {
-        Name = name;
-        _description = description;
-        _toolTipText = "Click to connect " + Name;
+        Pin = pin;
+        _toolTipText = "Click to connect " + Pin.Name;
         Parent = parent;
     }
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/NodeModel.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/NodeModel.cs
deleted file mode 100644
index 1ffc6f8f..00000000
--- a/src/OneWare.UniversalFpgaProjectSystem/Models/NodeModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace OneWare.UniversalFpgaProjectSystem.Models;
-
-public class NodeModel : ObservableObject
-{
-    public string Name { get; }
-    
-    public string Direction { get; }
-    
-    
-    private FpgaPinModel? _connection;
-    public FpgaPinModel? Connection
-    {
-        get => _connection;
-        set
-        {
-            this.SetProperty(ref _connection, value);
-        }
-    }
-
-    public NodeModel(string name,  string direction)
-    {
-        Name = name;
-        Direction = direction;
-    }
-    
-    public override string ToString()
-    {
-        return Name;
-    }
-}
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs b/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs
index c7e17023..a7f4788c 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/Models/UniversalFpgaProjectRoot.cs
@@ -50,7 +50,14 @@ public IProjectEntry? TopEntity
     public IFpgaToolchain? Toolchain
     {
         get => _toolchain;
-        set => SetProperty(ref _toolchain, value);
+        set
+        {
+            SetProperty(ref _toolchain, value);
+            if (_toolchain != null)
+                Properties[nameof(Toolchain)] = _toolchain.Name;
+            else
+                Properties.Remove(nameof(Toolchain));
+        }
     }
     
     private IFpgaLoader? _loader;
@@ -58,7 +65,14 @@ public IFpgaToolchain? Toolchain
     public IFpgaLoader? Loader
     {
         get => _loader;
-        set => SetProperty(ref _loader, value);
+        set
+        {
+            SetProperty(ref _loader, value);
+            if (_loader != null)
+                Properties[nameof(Loader)] = _loader.Name;
+            else
+                Properties.Remove(nameof(Loader));
+        }
     }
 
     public UniversalFpgaProjectRoot(string projectFilePath, JsonObject properties) : base(Path.GetDirectoryName(projectFilePath) ?? throw new NullReferenceException("Invalid Project Path"))
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Services/FpgaService.cs b/src/OneWare.UniversalFpgaProjectSystem/Services/FpgaService.cs
index 5dadfd5f..ea59f368 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Services/FpgaService.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/Services/FpgaService.cs
@@ -1,26 +1,34 @@
 using System.Collections.ObjectModel;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
 using OneWare.UniversalFpgaProjectSystem.Models;
+using Prism.Ioc;
 
 namespace OneWare.UniversalFpgaProjectSystem.Services;
 
 public class FpgaService
 {
-    private ObservableCollection<Type> FpgaModels { get; } = new();
-
-    public ObservableCollection<IFpgaToolchain> FpgaToolchains { get; } = new();
+    public Dictionary<IFpga, Type> CustomFpgaModels { get; } = new();
+    public ObservableCollection<IFpga> Fpgas { get; } = new();
+    public ObservableCollection<IFpgaToolchain> Toolchains { get; } = new();
+    public ObservableCollection<IFpgaLoader> Loaders { get; } = new();
     
-    public ObservableCollection<IFpgaLoader> FpgaLoaders { get; } = new();
+    public void RegisterFpga(IFpga fpga)
+    {
+        Fpgas.Add(fpga);
+    }
     
-    public void AddFpga<T>() where T : FpgaModelBase
+    public void RegisterCustomFpgaModel<T>(IFpga fpga) where T : FpgaModel
     {
-        FpgaModels.Add(typeof(T));
+        CustomFpgaModels.Add(fpga, typeof(T));
     }
-
-    public IEnumerable<FpgaModelBase> GetFpgas()
+    
+    public void RegisterToolchain<T>() where T : IFpgaToolchain
+    {
+        Toolchains.Add(ContainerLocator.Container.Resolve<T>());
+    }
+    
+    public void RegisterLoader<T>() where T : IFpgaLoader
     {
-        foreach (var t in FpgaModels)
-        {
-            yield return Activator.CreateInstance(t) as FpgaModelBase;
-        }
+        Loaders.Add(ContainerLocator.Container.Resolve<T>());
     }
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Services/IFpgaToolchain.cs b/src/OneWare.UniversalFpgaProjectSystem/Services/IFpgaToolchain.cs
index 86d37fc7..1bbdd49e 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Services/IFpgaToolchain.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/Services/IFpgaToolchain.cs
@@ -1,12 +1,14 @@
-namespace OneWare.UniversalFpgaProjectSystem.Services;
+using OneWare.UniversalFpgaProjectSystem.Models;
+
+namespace OneWare.UniversalFpgaProjectSystem.Services;
 
 public interface IFpgaToolchain
 {
     public string Name { get; }
 
-    public void LoadConnections();
+    public void LoadConnections(UniversalFpgaProjectRoot project, FpgaModel fpga);
 
-    public void SaveConnections();
+    public void SaveConnections(UniversalFpgaProjectRoot project, FpgaModel fpga);
 
     public void StartCompile();
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Services/INodeProvider.cs b/src/OneWare.UniversalFpgaProjectSystem/Services/INodeProvider.cs
index f1b333f3..416203a5 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Services/INodeProvider.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/Services/INodeProvider.cs
@@ -1,9 +1,9 @@
 using OneWare.Shared.Models;
-using OneWare.UniversalFpgaProjectSystem.Models;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
 
 namespace OneWare.UniversalFpgaProjectSystem.Services;
 
 public interface INodeProvider
 {
-    public IEnumerable<NodeModel> ExtractNodes(IProjectFile file);
+    public IEnumerable<FpgaNode> ExtractNodes(IProjectFile file);
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Styles/Components.axaml b/src/OneWare.UniversalFpgaProjectSystem/Styles/Components.axaml
index 0da82cf6..11c046ed 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Styles/Components.axaml
+++ b/src/OneWare.UniversalFpgaProjectSystem/Styles/Components.axaml
@@ -114,7 +114,7 @@
                                     <DataTriggerBehavior ComparisonCondition="Equal" Value="True">
                                         <DataTriggerBehavior.Binding>
                                             <MultiBinding Converter="{x:Static converters:SharedConverters.ObjectsEqualConverter}">
-                                                <Binding Path="Parent.SelectedPin" />
+                                                <Binding Path="Parent.SelectedPinModel" />
                                                 <Binding Path="#PinBorder.DataContext"/>
                                             </MultiBinding>
                                         </DataTriggerBehavior.Binding>
@@ -128,7 +128,7 @@
                                     <DataTriggerBehavior ComparisonCondition="Equal" Value="False">
                                         <DataTriggerBehavior.Binding>
                                             <MultiBinding Converter="{x:Static converters:SharedConverters.ObjectsEqualConverter}">
-                                                <Binding Path="Parent.SelectedPin" />
+                                                <Binding Path="Parent.SelectedPinModel" />
                                                 <Binding Path="#PinBorder.DataContext"/>
                                             </MultiBinding>
                                         </DataTriggerBehavior.Binding>
diff --git a/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs b/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs
index 86878cf4..4479dfd3 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/UniversalFpgaProjectManager.cs
@@ -6,6 +6,7 @@
 using OneWare.Shared.Services;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Parser;
+using OneWare.UniversalFpgaProjectSystem.Services;
 using OneWare.UniversalFpgaProjectSystem.ViewModels;
 using OneWare.UniversalFpgaProjectSystem.Views;
 using Prism.Ioc;
@@ -17,13 +18,15 @@ public class UniversalFpgaProjectManager : IProjectManager
     private readonly IProjectExplorerService _projectExplorerService;
     private readonly IDockService _dockService;
     private readonly IWindowService _windowService;
+    private readonly FpgaService _fpgaService;
 
     public UniversalFpgaProjectManager(IProjectExplorerService projectExplorerService, IDockService dockService,
-        IWindowService windowService)
+        IWindowService windowService, FpgaService fpgaService)
     {
         _projectExplorerService = projectExplorerService;
         _dockService = dockService;
         _windowService = windowService;
+        _fpgaService = fpgaService;
 
         _projectExplorerService.RegisterConstructContextMenu(ConstructContextMenu);
     }
@@ -50,6 +53,18 @@ await _windowService.ShowDialogAsync(new UniversalFpgaProjectCreatorView()
         {
             root.TopEntity = entity;
         }
+        
+        var toolchain = root.Properties["Toolchain"];
+        if (toolchain != null && _fpgaService.Toolchains.FirstOrDefault(x => x.Name == toolchain.ToString()) is {} tc)
+        {
+            root.Toolchain = tc;
+        }
+        
+        var loader = root.Properties["Loader"];
+        if (loader != null && _fpgaService.Loaders.FirstOrDefault(x => x.Name == loader.ToString()) is {} l)
+        {
+            root.Loader = l;
+        }
 
         return root;
     }
diff --git a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs
index 5a8fb298..ca44f00b 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCompileViewModel.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using DynamicData.Binding;
 using OneWare.Shared.Controls;
@@ -6,9 +7,9 @@
 using OneWare.Shared.Models;
 using OneWare.Shared.Services;
 using OneWare.Shared.ViewModels;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Services;
-using Prism.Ioc;
 
 namespace OneWare.UniversalFpgaProjectSystem.ViewModels;
 
@@ -18,16 +19,38 @@ public class UniversalFpgaProjectCompileViewModel : FlexibleWindowViewModelBase
     private readonly IProjectExplorerService _projectExplorerService;
     private readonly UniversalFpgaProjectRoot _project;
 
-    public ObservableCollection<FpgaModelBase> FpgaModels { get; } = new();
+    public ObservableCollection<FpgaModel> FpgaModels { get; } = new();
 
-    private FpgaModelBase? _selectedFpga;
-    public FpgaModelBase? SelectedFpga
+    private CompositeDisposable? _compositeDisposable;
+    
+    private FpgaModel? _selectedFpgaModel;
+    public FpgaModel? SelectedFpgaModel
     {
-        get => _selectedFpga;
-        set => SetProperty(ref _selectedFpga, value);
+        get => _selectedFpgaModel;
+        set
+        {
+            SetProperty(ref _selectedFpgaModel, value);
+            
+            _compositeDisposable?.Dispose();
+            _compositeDisposable = new CompositeDisposable();
+
+            if (value is not null)
+            {
+                _project.Toolchain?.LoadConnections(_project, value);
+                
+                Observable.FromEventPattern(value, nameof(value.NodeConnected)).Subscribe(_ =>
+                {
+                    IsDirty = true;
+                }).DisposeWith(_compositeDisposable);
+                Observable.FromEventPattern(value, nameof(value.NodeDisconnected)).Subscribe(_ =>
+                {
+                    IsDirty = true;
+                }).DisposeWith(_compositeDisposable);
+            }
+        }
     }
 
-    private bool _hideExtensions = false;
+    private bool _hideExtensions;
     public bool HideExtensions
     {
         get => _hideExtensions;
@@ -45,34 +68,35 @@ public UniversalFpgaProjectCompileViewModel(IWindowService windowService, IProje
             Title = $"Connect and Compile - {_project.Header}{(x ? "*" : "")}";
         });
         
-        foreach (var fpga in fpgaService.GetFpgas())
+        //Construct FpgaModels
+        foreach (var fpga in fpgaService.Fpgas)
         {
-            Observable.FromEventPattern(fpga, nameof(fpga.NodeConnected)).Subscribe(_ =>
-            {
-                IsDirty = true;
-            });
-
-            Observable.FromEventPattern(fpga, nameof(fpga.NodeDisconnected)).Subscribe(_ =>
-            {
-                IsDirty = true;
-            });
-            
-            FpgaModels.Add(fpga);
+            fpgaService.CustomFpgaModels.TryGetValue(fpga, out var custom);
+            custom ??= typeof(FpgaModel);
+            var model = Activator.CreateInstance(custom, fpga) as FpgaModel;
+            if (model is null) throw new NullReferenceException(nameof(model));
+            FpgaModels.Add(model);
         }
         
-        SelectedFpga = FpgaModels.FirstOrDefault();
-
-        if (project.TopEntity is IProjectFile file)
+        if (_project.TopEntity is IProjectFile file)
         {
             var provider = nodeProviderService.GetNodeProvider(file.Extension);
             if (provider is not null)
             {
-                var nodes = provider.ExtractNodes(file);
-                SelectedFpga?.VisibleNodes.AddRange(nodes);
+                var nodes = provider.ExtractNodes(file).ToArray();
+                foreach (var fpga in FpgaModels)
+                {
+                    foreach (var nodeModel in nodes)
+                    {
+                        fpga.AddNode(nodeModel);
+                    }
+                }
             }
         }
         
-        _project.Toolchain?.LoadConnections();
+        SelectedFpgaModel = FpgaModels.FirstOrDefault();
+
+        IsDirty = false;
     }
 
     public override void Close(FlexibleWindow window)
@@ -101,72 +125,13 @@ private async Task SafeQuitAsync(FlexibleWindow window)
     
     public void SaveAndClose(FlexibleWindow window)
     {
-        _project.Properties["Fpga"] = SelectedFpga?.Name;
-        CreatePcf();
-        _ = _projectExplorerService.SaveProjectAsync(_project);
-        IsDirty = false;
-        window.Close();
-    }
-    
-    private string RemoveLine(string file, string find)
-    {
-        var startIndex = file.IndexOf(find, StringComparison.Ordinal);
-        while (startIndex > -1)
-        {
-            var endIndex = file.IndexOf('\n', startIndex);
-            if (endIndex == -1) endIndex = file.Length - 1;
-            file = file.Remove(startIndex, endIndex - startIndex + 1);
-            startIndex = file.IndexOf(find, startIndex, StringComparison.Ordinal);
-        }
-
-        return file;
-    }
-    
-    private void LoadConnectionsFromPcf(string pcf, FpgaModelBase fpga)
-    {
-        var lines = pcf.Split('\n');
-        foreach (var line in lines)
-        {
-            var trimmedLine = line.Trim();
-            if (trimmedLine.StartsWith("set_io"))
-            {
-                var parts = trimmedLine.Split(' ');
-                if (parts.Length != 3)
-                {
-                    ContainerLocator.Container.Resolve<ILogger>().Warning("PCF Line invalid: " + trimmedLine);
-                    continue;
-                }
-
-                var signal = parts[1];
-                var pin = parts[2];
-
-                if (fpga.Pins.TryGetValue(pin, out var pinModel) && fpga.Nodes.TryGetValue(signal, out var signalModel))
-                {
-                    fpga.Connect(pinModel, signalModel);
-                } 
-            }
-        }
-    }
-    
-    private void CreatePcf()
-    {
-        if (SelectedFpga == null) return;
-        var pcfPath = Path.Combine(_project.FullPath, "project.pcf");
-            
-        var pcf = "";
-        if (File.Exists(pcfPath))
+        if (SelectedFpgaModel != null)
         {
-            var existingPcf = File.ReadAllText(pcfPath);
-            existingPcf = RemoveLine(existingPcf, "set_io");
-            pcf = existingPcf.Trim();
+            _project.Properties["Fpga"] = SelectedFpgaModel.Fpga.Name;
+            _project.Toolchain?.SaveConnections(_project, SelectedFpgaModel);
+            _ = _projectExplorerService.SaveProjectAsync(_project);
         }
-
-        foreach (var conn in SelectedFpga.Pins.Where(x => x.Value.Connection is not null))
-        {
-            pcf += $"\nset_io {conn.Value.Connection!.Name} {conn.Value.Name}";
-        }
-        pcf = pcf.Trim() + '\n';
-            
-        File.WriteAllText(pcfPath, pcf);
+        IsDirty = false;
+        window.Close();
     }
 }
\ No newline at end of file
diff --git a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectToolBarViewModel.cs b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectToolBarViewModel.cs
index a414056b..5ad83f66 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectToolBarViewModel.cs
+++ b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectToolBarViewModel.cs
@@ -34,6 +34,7 @@ public void ToggleProjectToolchain(IFpgaToolchain toolchain)
         {
             if (project.Toolchain != toolchain) project.Toolchain = toolchain;
             else project.Toolchain = null;
+            _ = ProjectExplorerService.SaveProjectAsync(project);
         }
     }
     
@@ -43,6 +44,7 @@ public void ToggleProjectLoader(IFpgaLoader loader)
         {
             if (project.Loader != loader) project.Loader = loader;
             else project.Loader = null;
+            _ = ProjectExplorerService.SaveProjectAsync(project);
         }
     }
     
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml
index 31ec14ac..b59635ee 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml
+++ b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectCompileView.axaml
@@ -16,7 +16,7 @@
                          x:DataType="viewModels:UniversalFpgaProjectCompileViewModel"
                          Name="UniversalFpgaProjectCompileViewView">
     <Interaction.Behaviors>
-        <behaviours:CommandOnEnterBehaviour Command="{Binding SelectedFpga.ConnectCommand, FallbackValue={x:Null}}" />
+        <behaviours:CommandOnEnterBehaviour Command="{Binding SelectedFpgaModel.ConnectCommand, FallbackValue={x:Null}}" />
     </Interaction.Behaviors>
 
     <Grid RowDefinitions="*, Auto">
@@ -25,16 +25,16 @@
                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Spacing="5">
                     <TextBlock Text="Select FPGA:" VerticalAlignment="Center" />
                     <ComboBox ItemsSource="{Binding FpgaModels}" MinWidth="150"
-                              SelectedItem="{Binding SelectedFpga, Mode=TwoWay}">
+                              SelectedItem="{Binding SelectedFpgaModel, Mode=TwoWay}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
-                                <TextBlock Text="{Binding Name}" Margin="5 0" VerticalAlignment="Center" />
+                                <TextBlock Text="{Binding Fpga.Name}" Margin="5 0" VerticalAlignment="Center" />
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
                 </StackPanel>
 
-                <DockPanel Grid.Row="1" DataContext="{Binding SelectedFpga}">
+                <DockPanel Grid.Row="1" DataContext="{Binding SelectedFpgaModel}">
 
                     <ContentControl Padding="0 10" DockPanel.Dock="Top"
                                     IsVisible="{Binding Converter={x:Static converters:SharedConverters.ViewFoundConverter}}"
@@ -54,16 +54,16 @@
                                           CanUserReorderColumns="False" CanUserResizeColumns="True"
                                           Background="{DynamicResource ThemeControlLowBrush}"
                                           RowBackground="Transparent" IsReadOnly="True"
-                                          ItemsSource="{Binding VisiblePins}"
-                                          SelectedItem="{Binding SelectedPin}"
+                                          ItemsSource="{Binding VisiblePinModels}"
+                                          SelectedItem="{Binding SelectedPinModel}"
                                           BorderThickness="0 1 0 0"
                                           VerticalScrollBarVisibility="Visible">
                                     <DataGrid.Columns>
-                                        <DataGridTextColumn Header="Pin" Width="*" Binding="{Binding Name}" />
+                                        <DataGridTextColumn Header="Pin" Width="*" Binding="{Binding Pin.Name}" />
                                         <DataGridTextColumn Header="Description" Width="*"
-                                                            Binding="{Binding Description}" />
+                                                            Binding="{Binding Pin.Description}" />
                                         <DataGridTextColumn Header="Node" Width="*"
-                                                            Binding="{Binding Connection.Name, FallbackValue={}}" />
+                                                            Binding="{Binding Connection.FpgaNode.Name, FallbackValue={}}" />
                                     </DataGrid.Columns>
                                 </DataGrid>
                             </DockPanel>
@@ -102,15 +102,15 @@
                                           CanUserResizeColumns="True"
                                           Background="{DynamicResource ThemeControlLowBrush}"
                                           RowBackground="Transparent" IsReadOnly="True"
-                                          ItemsSource="{Binding VisibleNodes}"
-                                          SelectedItem="{Binding SelectedNode}"
+                                          ItemsSource="{Binding VisibleNodeModels}"
+                                          SelectedItem="{Binding SelectedNodeModel}"
                                           BorderThickness="0 1 0 0"
                                           VerticalScrollBarVisibility="Visible">
                                     <DataGrid.Columns>
-                                        <DataGridTextColumn Header="Node" Width="*" Binding="{Binding Name}" />
-                                        <DataGridTextColumn Header="Direction" Width="*" Binding="{Binding Direction}" />
+                                        <DataGridTextColumn Header="Node" Width="*" Binding="{Binding FpgaNode.Name}" />
+                                        <DataGridTextColumn Header="Direction" Width="*" Binding="{Binding FpgaNode.Direction}" />
                                         <DataGridTextColumn Header="Pin" Width="*"
-                                                            Binding="{Binding Connection.Name, FallbackValue={}}" />
+                                                            Binding="{Binding Connection.Pin.Name, FallbackValue={}}" />
                                     </DataGrid.Columns>
                                 </DataGrid>
                             </DockPanel>
diff --git a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml
index 548ee136..749f6dcb 100644
--- a/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml
+++ b/src/OneWare.UniversalFpgaProjectSystem/Views/UniversalFpgaProjectToolBarView.axaml
@@ -22,7 +22,7 @@
         <Button>
             <Button.Flyout>
                 <Flyout FlyoutPresenterTheme="{StaticResource FlyoutNoPadding}">
-                    <ItemsControl ItemsSource="{Binding FpgaService.FpgaToolchains}">
+                    <ItemsControl ItemsSource="{Binding FpgaService.Toolchains}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate x:DataType="services:IFpgaToolchain">
                             <MenuItem Header="{Binding Name}" 
@@ -64,7 +64,7 @@
         <Button>
             <Button.Flyout>
                 <Flyout FlyoutPresenterTheme="{StaticResource FlyoutNoPadding}">
-                    <ItemsControl ItemsSource="{Binding FpgaService.FpgaLoaders}">
+                    <ItemsControl ItemsSource="{Binding FpgaService.Loaders}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="services:IFpgaLoader">
                                 <MenuItem Header="{Binding Name}" 
diff --git a/src/OneWare.Vhdl/Parsing/VhdlNodeProvider.cs b/src/OneWare.Vhdl/Parsing/VhdlNodeProvider.cs
index 4b7d9f76..485f8540 100644
--- a/src/OneWare.Vhdl/Parsing/VhdlNodeProvider.cs
+++ b/src/OneWare.Vhdl/Parsing/VhdlNodeProvider.cs
@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using OneWare.Shared.Models;
 using OneWare.UniversalFpgaProjectSystem;
+using OneWare.UniversalFpgaProjectSystem.Fpga;
 using OneWare.UniversalFpgaProjectSystem.Models;
 using OneWare.UniversalFpgaProjectSystem.Services;
 
@@ -8,13 +9,13 @@ namespace OneWare.Vhdl.Parsing;
 
 public class VhdlNodeProvider : INodeProvider
 {
-    public IEnumerable<NodeModel> ExtractNodes(IProjectFile file)
+    public IEnumerable<FpgaNode> ExtractNodes(IProjectFile file)
     {
         var fileLines = File.ReadAllLines(file.FullPath);
         return ExtractEntityPorts(fileLines);
     }
 
-    public static IEnumerable<NodeModel> ExtractEntityPorts(IEnumerable<string> vhdlLines)
+    public static IEnumerable<FpgaNode> ExtractEntityPorts(IEnumerable<string> vhdlLines)
     {
         bool inPortSection = false;
         var portPattern = @"\b(\w+)\s+:\s+(in|out|inout|buffer)\s+(\w+)(?:\((\d+)\s+downto\s+(\d+)\))?(?:\s+:=\s+[^;]+)?";
@@ -43,13 +44,13 @@ public static IEnumerable<NodeModel> ExtractEntityPorts(IEnumerable<string> vhdl
 
                         for (var i = upper; i >= lower; i--)
                         {
-                            yield return new NodeModel($"{portName}[{i}]", direction); //$"{portName}({i}) : {direction} {portType}";
+                            yield return new FpgaNode($"{portName}[{i}]", direction); //$"{portName}({i}) : {direction} {portType}";
                         }
                     }
                     else
                     {
                         // Single port
-                        yield return new NodeModel(portName, direction); // $"{portName} : {direction} {portType}";
+                        yield return new FpgaNode(portName, direction); // $"{portName} : {direction} {portType}";
                     }
                 }
             }