diff --git a/Hyperbar.Windows.Contextual/ContextualWidgetBuilder.cs b/Hyperbar.Windows.Contextual/ContextualWidgetBuilder.cs
index 5a42114..09b09b0 100644
--- a/Hyperbar.Windows.Contextual/ContextualWidgetBuilder.cs
+++ b/Hyperbar.Windows.Contextual/ContextualWidgetBuilder.cs
@@ -1,15 +1,11 @@
-using Hyperbar.Lifecycles;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Hyperbar.Extensions.Contextual;
+namespace Hyperbar.Widget.Contextual;
 
 public class ContextualWidgetBuilder : 
     IWidgetBuilder
 {
-    public void Create(IServiceCollection services)
-    {
-        services
+    public void Create(IServiceCollection services) => services
             .AddConfiguration<ContextualWidgetConfiguration>()
             .AddWidgetTemplate<ContextualWidgetViewModel>();
-    }
 }
diff --git a/Hyperbar.Windows.Contextual/ContextualWidgetConfiguration.cs b/Hyperbar.Windows.Contextual/ContextualWidgetConfiguration.cs
index 8531545..5187599 100644
--- a/Hyperbar.Windows.Contextual/ContextualWidgetConfiguration.cs
+++ b/Hyperbar.Windows.Contextual/ContextualWidgetConfiguration.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Extensions.Contextual;
+namespace Hyperbar.Widget.Contextual;
 
 public class ContextualWidgetConfiguration
 { 
diff --git a/Hyperbar.Windows.Contextual/ContextualWidgetViewModel.cs b/Hyperbar.Windows.Contextual/ContextualWidgetViewModel.cs
index def5a46..170fe8d 100644
--- a/Hyperbar.Windows.Contextual/ContextualWidgetViewModel.cs
+++ b/Hyperbar.Windows.Contextual/ContextualWidgetViewModel.cs
@@ -1,11 +1,12 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
+namespace Hyperbar.Widget.Contextual;
 
-namespace Hyperbar.Extensions.Contextual;
-
-public class ContextualWidgetViewModel(ITemplateFactory templateFactory) :
-    IWidgetViewModel,
-    ITemplatedViewModel
+public class ContextualWidgetViewModel :
+    WidgetViewModelBase
 {
-    public ITemplateFactory TemplateFactory { get; } = templateFactory;
-}
+    public ContextualWidgetViewModel(ITemplateFactory templateFactory, 
+        IServiceFactory serviceFactory) : base(templateFactory, serviceFactory)
+    {
+        Add<WidgetButtonViewModel>();
+        Add<WidgetButtonViewModel>();
+    }
+}
\ No newline at end of file
diff --git a/Hyperbar.Windows.Contextual/Hyperbar.Widget.Contextual.csproj b/Hyperbar.Windows.Contextual/Hyperbar.Widget.Contextual.csproj
index 4291d89..4a8f052 100644
--- a/Hyperbar.Windows.Contextual/Hyperbar.Widget.Contextual.csproj
+++ b/Hyperbar.Windows.Contextual/Hyperbar.Widget.Contextual.csproj
@@ -1,21 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<RootNamespace>Hyperbar.Windows.Contextual</RootNamespace>
-		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-		<UseWinUI>true</UseWinUI>
+		<TargetFramework>net8.0</TargetFramework>
 		<UseRidGraph>true</UseRidGraph>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Hyperbar.Windows.Win32\Hyperbar.Windows.Win32.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/Hyperbar.Windows.Primary/Hyperbar.Widget.Primary.csproj b/Hyperbar.Windows.Primary/Hyperbar.Widget.Primary.csproj
index b855d21..4a8f052 100644
--- a/Hyperbar.Windows.Primary/Hyperbar.Widget.Primary.csproj
+++ b/Hyperbar.Windows.Primary/Hyperbar.Widget.Primary.csproj
@@ -9,6 +9,6 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
+		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetBuilder.cs b/Hyperbar.Windows.Primary/PrimaryWidgetBuilder.cs
index b3a0ae3..d25e082 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetBuilder.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetBuilder.cs
@@ -1,4 +1,3 @@
-using Hyperbar.Lifecycles;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Hyperbar.Windows.Primary;
@@ -6,10 +5,7 @@ namespace Hyperbar.Windows.Primary;
 public class PrimaryWidgetBuilder :
     IWidgetBuilder
 {
-    public void Create(IServiceCollection services)
-    {
-        services.AddConfiguration<PrimaryWidgetConfiguration>()
-            .AddTransient<PrimaryWidgetViewModel>();
-    }
+    public void Create(IServiceCollection services) => services.AddConfiguration<PrimaryWidgetConfiguration>()
+            .AddWidgetTemplate<PrimaryWidgetViewModel>();
 }
 
diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs b/Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs
index 54f5206..f508571 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetViewModel.cs
@@ -1,14 +1,19 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
-
-namespace Hyperbar.Windows.Primary;
+namespace Hyperbar.Windows.Primary;
 
 public class PrimaryWidgetViewModel :
     WidgetViewModelBase
 {
-    public PrimaryWidgetViewModel(ITemplateFactory templateFactory) : base(templateFactory)
+    public PrimaryWidgetViewModel(ITemplateFactory templateFactory, 
+        IServiceFactory serviceFactory) : base(templateFactory, serviceFactory)
     {
+        ;
 
+        Add<WidgetButtonViewModel>("test 1", new Action(() => { 
+        
+        }));
+        Add<WidgetButtonViewModel>("test 2", new Action(() => { }));
+        Add<WidgetButtonViewModel>("test 4", new Action(() => { }));
+        Add<WidgetButtonViewModel>("test 5", new Action(() => { }));
     }
 }
 
diff --git a/Hyperbar.Windows/App.xaml.cs b/Hyperbar.Windows/App.xaml.cs
index d4c870b..1016aaf 100644
--- a/Hyperbar.Windows/App.xaml.cs
+++ b/Hyperbar.Windows/App.xaml.cs
@@ -1,10 +1,10 @@
 using Hyperbar.Windows.Controls;
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
+using Hyperbar.Widget.Contextual;
+using Hyperbar.Windows.Primary;
 
 namespace Hyperbar.Windows;
 
@@ -28,29 +28,30 @@ public partial class App :
             })
             .ConfigureServices((context, services) =>
             {
+                services.AddSingleton<IServiceFactory>(provider => 
+                    new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!)));
+
                 services.AddHostedService<AppService>();
-
                 services.AddTransient<IInitializer, AppInitializer>();
-                services.AddTransient<DesktopFlyout>();
-
                 services.AddTransient<ITemplateFactory, TemplateFactory>();
                 services.AddTransient<ITemplateGeneratorFactory, TemplateGeneratorFactory>();
 
+                services.AddTransient<DesktopFlyout>();
                 services.AddContentTemplate<CommandViewModel, CommandView>();
 
-                //services.AddCommand<ContextualCommandWidgetBuilder>("");
-                //services.AddWidget<PrimaryCommandWidgetBuilder>("");
+                services.AddWidget<ContextualWidgetBuilder>();
+                services.AddWidget<PrimaryWidgetBuilder>();
 
                 services.AddTransient(provider =>
                 {
                     static IEnumerable<IWidgetViewModel> Resolve(IServiceProvider services)
                     {
-                        foreach (IWidgetContext commandContext in services.GetServices<IWidgetContext>())
+                        foreach (IWidgetContext widgetContext in services.GetServices<IWidgetContext>())
                         {
-                            if (commandContext.ServiceProvider.GetService<IWidgetViewModel>() is 
-                                IWidgetViewModel commandViewModel)
+                            if (widgetContext.ServiceProvider.GetService<IWidgetViewModel>() is 
+                                IWidgetViewModel viewModel)
                             {
-                                yield return commandViewModel;
+                                yield return viewModel;
                             }
                         }
                     }
diff --git a/Hyperbar.Windows/Hyperbar.Windows.csproj b/Hyperbar.Windows/Hyperbar.Windows.csproj
index e198d5c..a66a4fb 100644
--- a/Hyperbar.Windows/Hyperbar.Windows.csproj
+++ b/Hyperbar.Windows/Hyperbar.Windows.csproj
@@ -14,6 +14,9 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
+	<ItemGroup>
+	  <None Remove="Views\WidgetButtonView.xaml" />
+	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Assets\SplashScreen.scale-200.png" />
 		<Content Include="Assets\LockScreenLogo.scale-200.png" />
@@ -38,6 +41,11 @@
 		<ProjectReference Include="..\Hyperbar.Windows.Primary\Hyperbar.Widget.Primary.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\WidgetButtonView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
 		<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
 	</PropertyGroup>
diff --git a/Hyperbar.Windows/Lifecycles/AppInitializer.cs b/Hyperbar.Windows/Lifecycles/AppInitializer.cs
index afd5838..f61f4bb 100644
--- a/Hyperbar.Windows/Lifecycles/AppInitializer.cs
+++ b/Hyperbar.Windows/Lifecycles/AppInitializer.cs
@@ -1,7 +1,5 @@
 using Hyperbar.Windows.Controls;
-using Hyperbar.Lifecycles;
 using Microsoft.Extensions.DependencyInjection;
-using System.Threading.Tasks;
 
 namespace Hyperbar.Windows;
 
diff --git a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
index 4b9daff..f6af132 100644
--- a/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
+++ b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
@@ -1,14 +1,11 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Hyperbar.Windows
 {
     public static class IServiceCollectionExtensions
     {
-        public static IServiceCollection AddWidget<TCommandBuilder>(this IServiceCollection services, 
-            string key)
+        public static IServiceCollection AddWidget<TCommandBuilder>(this IServiceCollection services)
             where TCommandBuilder :
             IWidgetBuilder, new()
         {
@@ -16,6 +13,12 @@ namespace Hyperbar.Windows
             IHost? host = new HostBuilder()
                 .ConfigureServices(isolatedServices =>
                 {
+                    isolatedServices.AddSingleton<IServiceFactory>(provider =>
+                        new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!)));
+
+                    isolatedServices.AddTransient<IWidgetView, WidgetView>();
+                    isolatedServices.AddContentTemplate<WidgetButtonViewModel, WidgetButtonView>();
+
                     isolatedServices.AddTransient<ITemplateFactory, TemplateFactory>();
                     isolatedServices.AddTransient<ITemplateGeneratorFactory, TemplateGeneratorFactory>();
 
diff --git a/Hyperbar.Windows/Templates/TemplateFactory.cs b/Hyperbar.Windows/Templates/TemplateFactory.cs
index 0f47a28..d04907f 100644
--- a/Hyperbar.Windows/Templates/TemplateFactory.cs
+++ b/Hyperbar.Windows/Templates/TemplateFactory.cs
@@ -1,10 +1,6 @@
-using Hyperbar.Templates;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Hyperbar.Windows;
 
diff --git a/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs b/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
index ef3ca80..72efc22 100644
--- a/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
+++ b/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
@@ -1,5 +1,4 @@
-using Hyperbar.Templates;
-using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Hyperbar.Windows;
diff --git a/Hyperbar.Windows/Views/CommandViewModel.cs b/Hyperbar.Windows/Views/CommandViewModel.cs
index b3d0718..1fd43a1 100644
--- a/Hyperbar.Windows/Views/CommandViewModel.cs
+++ b/Hyperbar.Windows/Views/CommandViewModel.cs
@@ -1,18 +1,15 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
-using System.Collections.Generic;
-
-namespace Hyperbar.Windows;
+namespace Hyperbar.Windows;
 
 public partial class CommandViewModel : 
-    ObservableCollectionViewModel,
+    ObservableCollectionViewModel<IWidgetViewModel>,
     ITemplatedViewModel
 {
-    public CommandViewModel(ITemplateFactory templateFactory, 
-        IEnumerable<IWidgetViewModel> commands)
+    public CommandViewModel(ITemplateFactory templateFactory,
+        IServiceFactory serviceFactory,
+        IEnumerable<IWidgetViewModel> widgets) : base(serviceFactory)
     {
         TemplateFactory = templateFactory;
-        AddRange(commands);
+        AddRange(widgets);
     }
 
     public ITemplateFactory TemplateFactory { get; }
diff --git a/Hyperbar.Windows/Views/WidgetButtonView.xaml b/Hyperbar.Windows/Views/WidgetButtonView.xaml
new file mode 100644
index 0000000..b7d76d9
--- /dev/null
+++ b/Hyperbar.Windows/Views/WidgetButtonView.xaml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Hyperbar.Windows.WidgetButtonView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrush" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="Transparent" />
+        <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="Transparent" />
+        <x:Double x:Key="ButtonWidth">32</x:Double>
+        <x:Double x:Key="ButtonHeight">32</x:Double>
+    </UserControl.Resources>
+    <Button
+        Width="{StaticResource ButtonWidth}"
+        Height="{StaticResource ButtonHeight}"
+        Command="{Binding Click}"
+        Content="{Binding Icon}" />
+</UserControl>
diff --git a/Hyperbar.Windows/Views/WidgetButtonView.xaml.cs b/Hyperbar.Windows/Views/WidgetButtonView.xaml.cs
new file mode 100644
index 0000000..a44d56f
--- /dev/null
+++ b/Hyperbar.Windows/Views/WidgetButtonView.xaml.cs
@@ -0,0 +1,9 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows;
+
+public sealed partial class WidgetButtonView : 
+    UserControl
+{
+    public WidgetButtonView() => InitializeComponent();
+}
diff --git a/Hyperbar.Windows/Views/WidgetView.xaml b/Hyperbar.Windows/Views/WidgetView.xaml
index d2b9c33..b683edd 100644
--- a/Hyperbar.Windows/Views/WidgetView.xaml
+++ b/Hyperbar.Windows/Views/WidgetView.xaml
@@ -3,5 +3,11 @@
     x:Class="Hyperbar.Windows.WidgetView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Grid />
+    <ItemsControl ItemTemplateSelector="{Binding TemplateFactory}" ItemsSource="{Binding}">
+        <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+                <StackPanel Orientation="Horizontal" Spacing="8" />
+            </ItemsPanelTemplate>
+        </ItemsControl.ItemsPanel>
+    </ItemsControl>
 </UserControl>
diff --git a/Hyperbar/Configuration/ConfigurationWriter.cs b/Hyperbar/Configuration/ConfigurationWriter.cs
index 330fa58..830eb85 100644
--- a/Hyperbar/Configuration/ConfigurationWriter.cs
+++ b/Hyperbar/Configuration/ConfigurationWriter.cs
@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Hyperbar.Options;
+namespace Hyperbar;
 
 public class ConfigurationWriter<TConfiguration>(string path,
     string section,
diff --git a/Hyperbar/Configuration/IConfigurationWriter.cs b/Hyperbar/Configuration/IConfigurationWriter.cs
index 79d0c00..d17c420 100644
--- a/Hyperbar/Configuration/IConfigurationWriter.cs
+++ b/Hyperbar/Configuration/IConfigurationWriter.cs
@@ -1,12 +1,10 @@
-
-namespace Hyperbar.Options
-{
-    public interface IConfigurationWriter<TConfiguration>
-        where TConfiguration : 
-        class, new()
-    {
-        void Write(Action<TConfiguration> updateDelegate);
+namespace Hyperbar;
 
-        void Write(TConfiguration value);
-    }
+public interface IConfigurationWriter<TConfiguration>
+    where TConfiguration : 
+    class, new()
+{
+    void Write(Action<TConfiguration> updateDelegate);
+
+    void Write(TConfiguration value);
 }
\ No newline at end of file
diff --git a/Hyperbar/Configuration/WritableConfiguration.cs b/Hyperbar/Configuration/WritableConfiguration.cs
index d0ce0e8..8e42074 100644
--- a/Hyperbar/Configuration/WritableConfiguration.cs
+++ b/Hyperbar/Configuration/WritableConfiguration.cs
@@ -1,5 +1,4 @@
-using Hyperbar.Options;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
 namespace Hyperbar;
diff --git a/Hyperbar/Extensions/IServiceCollectionExtensions.cs b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
index a363f22..e722cb8 100644
--- a/Hyperbar/Extensions/IServiceCollectionExtensions.cs
+++ b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
@@ -1,7 +1,4 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Options;
-using Hyperbar.Templates;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
@@ -67,11 +64,11 @@ public static class IServiceCollectionExtensions
         string key = contentType.Name;
         
         services.AddTransient(typeof(IWidgetViewModel), contentType);
-        services.TryAddTransient(provider => provider.GetService<IWidgetView>()!);
+        services.TryAddTransient(templateType, provider => provider.GetService<IWidgetView>()!);
 
         services.AddKeyedTransient(typeof(IWidgetViewModel), key, contentType);
-        services.TryAddKeyedTransient(templateType, key);
-        
+        services.TryAddKeyedTransient<IWidgetView>(key, (provider, key) => provider.GetService<IWidgetView>()!);
+
         services.AddTransient<IContentTemplateDescriptor>(provider => new ContentTemplateDescriptor
         {
             ContentType = contentType,
diff --git a/Hyperbar/Factories/IServiceFactory.cs b/Hyperbar/Factories/IServiceFactory.cs
new file mode 100644
index 0000000..04e0c0d
--- /dev/null
+++ b/Hyperbar/Factories/IServiceFactory.cs
@@ -0,0 +1,6 @@
+namespace Hyperbar;
+
+public interface IServiceFactory
+{
+    TService Create<TService>(params object?[] parameters);
+}
diff --git a/Hyperbar/Factories/ServiceFactory.cs b/Hyperbar/Factories/ServiceFactory.cs
new file mode 100644
index 0000000..2165dc9
--- /dev/null
+++ b/Hyperbar/Factories/ServiceFactory.cs
@@ -0,0 +1,8 @@
+namespace Hyperbar;
+
+public class ServiceFactory(Func<Type, object?[], object> factory) : 
+    IServiceFactory
+{
+    public TService Create<TService>(params object?[] parameters) => 
+        (TService)factory(typeof(TService), parameters);
+}
diff --git a/Hyperbar/Hyperbar.csproj b/Hyperbar/Hyperbar.csproj
index 26d19f6..c55732b 100644
--- a/Hyperbar/Hyperbar.csproj
+++ b/Hyperbar/Hyperbar.csproj
@@ -5,6 +5,7 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/Hyperbar/Lifecycles/AppService.cs b/Hyperbar/Lifecycles/AppService.cs
index 614583f..3fd1fb2 100644
--- a/Hyperbar/Lifecycles/AppService.cs
+++ b/Hyperbar/Lifecycles/AppService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Hosting;
 
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public class AppService(IEnumerable<IInitializer> initializers) :
     IHostedService
diff --git a/Hyperbar/Lifecycles/IInitializer.cs b/Hyperbar/Lifecycles/IInitializer.cs
index 4233207..57714a1 100644
--- a/Hyperbar/Lifecycles/IInitializer.cs
+++ b/Hyperbar/Lifecycles/IInitializer.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public interface IInitializer
 {
diff --git a/Hyperbar/Lifecycles/IWidgetBuilder.cs b/Hyperbar/Lifecycles/IWidgetBuilder.cs
index 43f66e3..8734d65 100644
--- a/Hyperbar/Lifecycles/IWidgetBuilder.cs
+++ b/Hyperbar/Lifecycles/IWidgetBuilder.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public interface IWidgetBuilder
 {
diff --git a/Hyperbar/Lifecycles/IWidgetContext.cs b/Hyperbar/Lifecycles/IWidgetContext.cs
index a56c855..4a8766f 100644
--- a/Hyperbar/Lifecycles/IWidgetContext.cs
+++ b/Hyperbar/Lifecycles/IWidgetContext.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public interface IWidgetContext
 {
diff --git a/Hyperbar/Lifecycles/ObservableCollectionViewModel.cs b/Hyperbar/Lifecycles/ObservableCollectionViewModel.cs
deleted file mode 100644
index 3576793..0000000
--- a/Hyperbar/Lifecycles/ObservableCollectionViewModel.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace Hyperbar.Lifecycles;
-
-public class ObservableCollectionViewModel<TItem> :
-    ObservableCollection<TItem>
-{
-    public void AddRange(IEnumerable<TItem> collection)
-    {
-        foreach (TItem? item in collection)
-        {
-            Add(item);
-        }
-    }
-}
-
-public class ObservableCollectionViewModel :
-    ObservableCollectionViewModel<object>
-{
-
-}
diff --git a/Hyperbar/Lifecycles/WidgetButtonViewModel.cs b/Hyperbar/Lifecycles/WidgetButtonViewModel.cs
deleted file mode 100644
index ea4b97f..0000000
--- a/Hyperbar/Lifecycles/WidgetButtonViewModel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Hyperbar.Lifecycles;
-
-public class WidgetButtonViewModel
-{
-
-}
diff --git a/Hyperbar/Lifecycles/WidgetContext.cs b/Hyperbar/Lifecycles/WidgetContext.cs
index f07b1db..9e5cf65 100644
--- a/Hyperbar/Lifecycles/WidgetContext.cs
+++ b/Hyperbar/Lifecycles/WidgetContext.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public class WidgetContext(IServiceProvider serviceProvider) :
     IWidgetContext
diff --git a/Hyperbar/Lifecycles/WidgetViewModelBase.cs b/Hyperbar/Lifecycles/WidgetViewModelBase.cs
deleted file mode 100644
index 2aa774e..0000000
--- a/Hyperbar/Lifecycles/WidgetViewModelBase.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Hyperbar.Templates;
-
-namespace Hyperbar.Lifecycles;
-
-public class WidgetViewModelBase(ITemplateFactory templateFactory) :
-    ObservableCollectionViewModel<IWidgetComponentViewModel>,
-    IWidgetViewModel,
-    ITemplatedViewModel
-{
-    public ITemplateFactory TemplateFactory { get; } = templateFactory;
-}
diff --git a/Hyperbar/Mediators/CommandClassHandlerWrapper.cs b/Hyperbar/Mediators/CommandClassHandlerWrapper.cs
new file mode 100644
index 0000000..4d2bc79
--- /dev/null
+++ b/Hyperbar/Mediators/CommandClassHandlerWrapper.cs
@@ -0,0 +1,27 @@
+namespace Hyperbar;
+
+public class CommandClassHandlerWrapper<TRequest, TResponse> 
+    where TRequest : 
+    class,
+    ICommand<TResponse>
+{
+    private readonly MessageHandlerDelegate<TRequest, TResponse> handler;
+
+    public CommandClassHandlerWrapper(ICommandHandler<TRequest, TResponse> concreteHandler,
+        IEnumerable<IPipelineBehavior<TRequest, TResponse>> pipelineBehaviours)
+    {
+        MessageHandlerDelegate<TRequest, TResponse> handler = concreteHandler.Handle;
+
+        foreach (IPipelineBehavior<TRequest, TResponse>? pipeline in pipelineBehaviours.Reverse())
+        {
+            MessageHandlerDelegate<TRequest, TResponse> handlerCopy = handler;
+            IPipelineBehavior<TRequest, TResponse> pipelineCopy = pipeline;
+            handler = (TRequest message, CancellationToken cancellationToken) => 
+                pipelineCopy.Handle(message, handlerCopy, cancellationToken);
+        }
+
+        this.handler = handler;
+    }
+
+    public ValueTask<TResponse> Handle(TRequest request, CancellationToken cancellationToken) => handler(request, cancellationToken);
+}
diff --git a/Hyperbar/Mediators/ICommand.cs b/Hyperbar/Mediators/ICommand.cs
new file mode 100644
index 0000000..29e50e7
--- /dev/null
+++ b/Hyperbar/Mediators/ICommand.cs
@@ -0,0 +1,6 @@
+namespace Hyperbar;
+
+public interface ICommand : ICommand<Unit>;
+
+public interface ICommand<out TResponse> : IMessage;
+
diff --git a/Hyperbar/Mediators/ICommandHandler.cs b/Hyperbar/Mediators/ICommandHandler.cs
new file mode 100644
index 0000000..210a092
--- /dev/null
+++ b/Hyperbar/Mediators/ICommandHandler.cs
@@ -0,0 +1,13 @@
+namespace Hyperbar;
+
+public interface ICommandHandler<in TCommand> : ICommandHandler<TCommand, Unit>
+    where TCommand : 
+    ICommand<Unit>;
+
+public interface ICommandHandler<in TCommand, TResponse> 
+    where TCommand : 
+    ICommand<TResponse>
+{
+    ValueTask<TResponse> Handle(TCommand command, 
+        CancellationToken cancellationToken);
+}
diff --git a/Hyperbar/Mediators/IMediator.cs b/Hyperbar/Mediators/IMediator.cs
new file mode 100644
index 0000000..68eab3c
--- /dev/null
+++ b/Hyperbar/Mediators/IMediator.cs
@@ -0,0 +1,24 @@
+namespace Hyperbar;
+
+public interface IMediator
+{
+    ValueTask Publish<TNotification>(TNotification notification, 
+        CancellationToken cancellationToken = default) 
+        where TNotification : 
+        INotification;
+
+    ValueTask<TResponse> Send<TResponse>(IRequest<TResponse> request,
+        CancellationToken cancellationToken = default);
+
+    ValueTask<TResponse> Send<TResponse>(ICommand<TResponse> command,
+        CancellationToken cancellationToken = default);
+
+    ValueTask<TResponse> Send<TResponse>(IQuery<TResponse> query, 
+        CancellationToken cancellationToken = default);
+
+    ValueTask<object?> Send(object message, CancellationToken 
+        cancellationToken = default);
+
+    void Subscribe(object subscriber);
+}
+
diff --git a/Hyperbar/Mediators/IMessage.cs b/Hyperbar/Mediators/IMessage.cs
new file mode 100644
index 0000000..45718a7
--- /dev/null
+++ b/Hyperbar/Mediators/IMessage.cs
@@ -0,0 +1,4 @@
+namespace Hyperbar;
+
+public interface IMessage;
+
diff --git a/Hyperbar/Mediators/INotification.cs b/Hyperbar/Mediators/INotification.cs
new file mode 100644
index 0000000..a59c987
--- /dev/null
+++ b/Hyperbar/Mediators/INotification.cs
@@ -0,0 +1,4 @@
+namespace Hyperbar;
+
+public interface INotification : IMessage;
+
diff --git a/Hyperbar/Mediators/INotificationHandler.cs b/Hyperbar/Mediators/INotificationHandler.cs
new file mode 100644
index 0000000..77b1523
--- /dev/null
+++ b/Hyperbar/Mediators/INotificationHandler.cs
@@ -0,0 +1,10 @@
+namespace Hyperbar;
+
+public interface INotificationHandler<in TNotification> 
+    where TNotification : 
+    INotification
+{
+    ValueTask Handle(TNotification notification, 
+        CancellationToken cancellationToken);
+}
+
diff --git a/Hyperbar/Mediators/IPipelineBehavior.cs b/Hyperbar/Mediators/IPipelineBehavior.cs
new file mode 100644
index 0000000..159fe80
--- /dev/null
+++ b/Hyperbar/Mediators/IPipelineBehavior.cs
@@ -0,0 +1,12 @@
+namespace Hyperbar;
+
+public interface IPipelineBehavior<TMessage, TResponse> 
+    where TMessage : 
+    notnull, 
+    IMessage
+{
+    ValueTask<TResponse> Handle(TMessage message,
+        MessageHandlerDelegate<TMessage, TResponse> next,
+        CancellationToken cancellationToken = default);
+}
+
diff --git a/Hyperbar/Mediators/IQuery.cs b/Hyperbar/Mediators/IQuery.cs
new file mode 100644
index 0000000..2efc47e
--- /dev/null
+++ b/Hyperbar/Mediators/IQuery.cs
@@ -0,0 +1,3 @@
+namespace Hyperbar;
+
+public interface IQuery<out TResponse> : IMessage;
diff --git a/Hyperbar/Mediators/IQueryHandler.cs b/Hyperbar/Mediators/IQueryHandler.cs
new file mode 100644
index 0000000..5f1e9ff
--- /dev/null
+++ b/Hyperbar/Mediators/IQueryHandler.cs
@@ -0,0 +1,9 @@
+namespace Hyperbar;
+
+public interface IQueryHandler<in TQuery, TResponse> 
+    where TQuery :
+    IQuery<TResponse>
+{
+    ValueTask<TResponse> Handle(TQuery query, 
+        CancellationToken cancellationToken);
+}
diff --git a/Hyperbar/Mediators/IRequest.cs b/Hyperbar/Mediators/IRequest.cs
new file mode 100644
index 0000000..647e850
--- /dev/null
+++ b/Hyperbar/Mediators/IRequest.cs
@@ -0,0 +1,5 @@
+namespace Hyperbar;
+
+public interface IRequest<out TResponse> : IMessage;
+
+public interface IRequest : IRequest<Unit>;
diff --git a/Hyperbar/Mediators/IRequestHandler.cs b/Hyperbar/Mediators/IRequestHandler.cs
new file mode 100644
index 0000000..ed4941f
--- /dev/null
+++ b/Hyperbar/Mediators/IRequestHandler.cs
@@ -0,0 +1,17 @@
+namespace Hyperbar;
+
+public interface IRequestHandler<in TRequest, TResponse>
+    where TRequest :
+    IRequest<TResponse>
+{
+    ValueTask<TResponse> Handle(TRequest request, 
+        CancellationToken cancellationToken);
+}
+
+public interface IRequestHandler<in TRequest> : 
+    IRequestHandler<TRequest, Unit> 
+    where TRequest : 
+    IRequest<Unit>
+{
+
+}
diff --git a/Hyperbar/Mediators/Mediator.cs b/Hyperbar/Mediators/Mediator.cs
new file mode 100644
index 0000000..f77f1f9
--- /dev/null
+++ b/Hyperbar/Mediators/Mediator.cs
@@ -0,0 +1,149 @@
+using Microsoft.Extensions.DependencyInjection;
+using System.Runtime.CompilerServices;
+
+namespace Hyperbar;
+
+public class Mediator(IServiceProvider provider) : 
+    IMediator
+{
+    private readonly ConditionalWeakTable<Type, dynamic> handlers = [];
+
+    public ValueTask Publish<TNotification>(TNotification notification, 
+        CancellationToken cancellationToken = default) 
+        where TNotification : 
+        INotification
+    {
+        List<INotificationHandler<TNotification>> handlers = 
+            provider.GetServices<INotificationHandler<TNotification>>().ToList();
+
+        foreach (KeyValuePair<Type, dynamic> handler in this.handlers)
+        {
+            if (handler.Key == typeof(TNotification))
+            {
+                handlers.Add(handler.Value);
+            }
+        }
+
+        if (handlers.Count == 0)
+        {
+            return default;
+        }
+        else if (handlers.Count == 1)
+        {
+            return handlers[0].Handle(notification, cancellationToken);
+        }
+
+        return default;
+    }
+
+    public ValueTask<TResponse> Send<TResponse>(IRequest<TResponse> request, 
+        CancellationToken cancellationToken = default)
+    {
+        dynamic? handler = provider.GetService(typeof(RequestClassHandlerWrapper<,>)
+            .MakeGenericType(request.GetType(), typeof(TResponse)));
+
+        if (handler is not null)
+        {
+            return handler.Handle((dynamic)request, cancellationToken);
+        }
+
+        return default;
+    }
+
+    public ValueTask<TResponse> Send<TResponse>(ICommand<TResponse> command, 
+        CancellationToken cancellationToken = default)
+    {
+        dynamic? handler = provider.GetService(typeof(CommandClassHandlerWrapper<,>)
+            .MakeGenericType(command.GetType(), typeof(TResponse)));
+
+        if (handler is not null)
+        {
+            return handler.Handle((dynamic)command, cancellationToken);
+        }
+
+        return default;
+    }
+
+    public ValueTask<TResponse> Send<TResponse>(IQuery<TResponse> query, 
+        CancellationToken cancellationToken = default)
+    {
+        dynamic? handler = provider.GetService(typeof(QueryClassHandlerWrapper<,>)
+            .MakeGenericType(query.GetType(), typeof(TResponse)));
+
+        if (handler is not null)
+        {
+            return handler.Handle((dynamic)query, cancellationToken);
+        }
+
+        return default;
+    }
+
+    public ValueTask<object?> Send(object message,
+        CancellationToken cancellationToken = default)
+    {
+        if (message.GetType().GetInterface(typeof(IRequest<>).Name) is { } requestType)
+        {
+            if (requestType.GetGenericArguments() is { Length: 1 } arguments)
+            {
+                Type responseType = arguments[0];
+
+                dynamic? handler = provider.GetService(typeof(RequestClassHandlerWrapper<,>)
+                    .MakeGenericType(message.GetType(), responseType));
+
+                if (handler is not null)
+                {
+                    return handler.Handle((dynamic)message, cancellationToken);
+                }
+            }
+        }
+
+        if (message.GetType().GetInterface(typeof(ICommand<>).Name) is { } commandType)
+        {
+            if (commandType.GetGenericArguments() is { Length: 1 } arguments)
+            {
+                Type responseType = arguments[0];
+
+                dynamic? handler = provider.GetService(typeof(CommandClassHandlerWrapper<,>)
+                    .MakeGenericType(message.GetType(), responseType));
+
+                if (handler is not null)
+                {
+                    return handler.Handle((dynamic)message, cancellationToken);
+                }
+            }
+        }
+
+        if (message.GetType().GetInterface(typeof(IQuery<>).Name) is { } queryType)
+        {
+            if (queryType.GetGenericArguments() is { Length: 1 } arguments)
+            {
+                Type responseType = arguments[0];
+
+                dynamic? handler = provider.GetService(typeof(QueryClassHandlerWrapper<,>)
+                    .MakeGenericType(message.GetType(), responseType));
+                if (handler is not null)
+                {
+                    return handler.Handle((dynamic)message, cancellationToken);
+                }
+            }
+        }
+
+        return default;
+    }
+
+    public void Subscribe(object subject)
+    {
+        Type[] interfaceTypes = subject.GetType().GetInterfaces();
+        foreach (Type interfaceType in interfaceTypes.Where(x => x.IsGenericType))
+        {
+            if (interfaceType.GetGenericTypeDefinition() == typeof(INotificationHandler<>))
+            {
+                if (interfaceType.GetGenericArguments() is { Length: 1 } arguments)
+                {
+                    Type notificationType = arguments[0];
+                    handlers.Add(notificationType, subject);
+                }
+            }
+        }
+    }
+}
diff --git a/Hyperbar/Mediators/MessageHandlerDelegate.cs b/Hyperbar/Mediators/MessageHandlerDelegate.cs
new file mode 100644
index 0000000..5d39bfa
--- /dev/null
+++ b/Hyperbar/Mediators/MessageHandlerDelegate.cs
@@ -0,0 +1,7 @@
+namespace Hyperbar;
+
+public delegate ValueTask<TResponse> MessageHandlerDelegate<TMessage, TResponse>(TMessage message,
+    CancellationToken cancellationToken)
+    where TMessage :
+    notnull,
+    IMessage;
diff --git a/Hyperbar/Mediators/QueryClassHandlerWrapper.cs b/Hyperbar/Mediators/QueryClassHandlerWrapper.cs
new file mode 100644
index 0000000..6fd0c40
--- /dev/null
+++ b/Hyperbar/Mediators/QueryClassHandlerWrapper.cs
@@ -0,0 +1,28 @@
+namespace Hyperbar;
+
+public class QueryClassHandlerWrapper<TRequest, TResponse> 
+    where TRequest : 
+    class,
+    IQuery<TResponse>
+{
+    private readonly MessageHandlerDelegate<TRequest, TResponse> handler;
+
+    public QueryClassHandlerWrapper(IQueryHandler<TRequest, TResponse> concreteHandler,
+        IEnumerable<IPipelineBehavior<TRequest, TResponse>> pipelineBehaviours)
+    {
+        MessageHandlerDelegate<TRequest, TResponse> handler = concreteHandler.Handle;
+
+        foreach (IPipelineBehavior<TRequest, TResponse>? pipeline in pipelineBehaviours.Reverse())
+        {
+            MessageHandlerDelegate<TRequest, TResponse> handlerCopy = handler;
+            IPipelineBehavior<TRequest, TResponse> pipelineCopy = pipeline;
+            handler = (TRequest message, CancellationToken cancellationToken) =>
+                pipelineCopy.Handle(message, handlerCopy, cancellationToken);
+        }
+
+        this.handler = handler;
+    }
+
+    public ValueTask<TResponse> Handle(TRequest request, CancellationToken cancellationToken) =>
+        handler(request, cancellationToken);
+}
diff --git a/Hyperbar/Mediators/RequestClassHandlerWrapper.cs b/Hyperbar/Mediators/RequestClassHandlerWrapper.cs
new file mode 100644
index 0000000..79bfd15
--- /dev/null
+++ b/Hyperbar/Mediators/RequestClassHandlerWrapper.cs
@@ -0,0 +1,27 @@
+namespace Hyperbar;
+
+public class RequestClassHandlerWrapper<TRequest, TResponse>
+    where TRequest : 
+    class, 
+    IRequest<TResponse>
+{
+    private readonly MessageHandlerDelegate<TRequest, TResponse> handler;
+
+    public RequestClassHandlerWrapper(IRequestHandler<TRequest, TResponse> concreteHandler,
+        IEnumerable<IPipelineBehavior<TRequest, TResponse>> pipelineBehaviours)
+    {
+        MessageHandlerDelegate<TRequest, TResponse> handler = concreteHandler.Handle;
+        foreach (IPipelineBehavior<TRequest, TResponse>? pipeline in pipelineBehaviours.Reverse())
+        {
+            MessageHandlerDelegate<TRequest, TResponse> handlerCopy = handler;
+            IPipelineBehavior<TRequest, TResponse> pipelineCopy = pipeline;
+
+            handler = (TRequest message, CancellationToken cancellationToken) => 
+                pipelineCopy.Handle(message, handlerCopy, cancellationToken);
+        }
+
+        this.handler = handler;
+    }
+
+    public ValueTask<TResponse> Handle(TRequest request, CancellationToken cancellationToken) => handler(request, cancellationToken);
+}
diff --git a/Hyperbar/Mediators/Unit.cs b/Hyperbar/Mediators/Unit.cs
new file mode 100644
index 0000000..7eb31c6
--- /dev/null
+++ b/Hyperbar/Mediators/Unit.cs
@@ -0,0 +1,30 @@
+namespace Hyperbar;
+
+public readonly struct Unit : 
+    IEquatable<Unit>, 
+    IComparable<Unit>, 
+    IComparable
+{
+    private static readonly Unit value = new();
+
+    public static ref readonly Unit Value => ref value;
+
+    public static ValueTask<Unit> ValueTask => new(value);
+
+    public int CompareTo(Unit other) => 0;
+
+    int IComparable.CompareTo(object? obj) => 0;
+
+    public override int GetHashCode() => 0;
+
+    public bool Equals(Unit other) => true;
+
+    public override bool Equals(object? obj) => obj is Unit;
+
+    public static bool operator ==(Unit _, Unit __) => true;
+
+    public static bool operator !=(Unit _, Unit __) => false;
+
+    public override string ToString() => "()";
+}
+
diff --git a/Hyperbar/Templates/ContentTemplateDescriptor.cs b/Hyperbar/Templates/ContentTemplateDescriptor.cs
index 6f1a788..b85314e 100644
--- a/Hyperbar/Templates/ContentTemplateDescriptor.cs
+++ b/Hyperbar/Templates/ContentTemplateDescriptor.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Templates;
+namespace Hyperbar;
 
 public record ContentTemplateDescriptor :
     IContentTemplateDescriptor
diff --git a/Hyperbar/Templates/IContentTemplateDescriptor.cs b/Hyperbar/Templates/IContentTemplateDescriptor.cs
index fcaabf8..7f8ff19 100644
--- a/Hyperbar/Templates/IContentTemplateDescriptor.cs
+++ b/Hyperbar/Templates/IContentTemplateDescriptor.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Templates;
+namespace Hyperbar;
 
 public interface IContentTemplateDescriptor
 {
diff --git a/Hyperbar/Templates/ITemplateFactory.cs b/Hyperbar/Templates/ITemplateFactory.cs
index db5d881..73bf234 100644
--- a/Hyperbar/Templates/ITemplateFactory.cs
+++ b/Hyperbar/Templates/ITemplateFactory.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Templates;
+namespace Hyperbar;
 
 public interface ITemplateFactory
 {
diff --git a/Hyperbar/Templates/ITemplatedViewModel.cs b/Hyperbar/Templates/ITemplatedViewModel.cs
index d98d0f8..04a61f1 100644
--- a/Hyperbar/Templates/ITemplatedViewModel.cs
+++ b/Hyperbar/Templates/ITemplatedViewModel.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Templates;
+namespace Hyperbar;
 
 public interface ITemplatedViewModel
 {
diff --git a/Hyperbar/Lifecycles/IWidgetComponentViewModel.cs b/Hyperbar/Views/IWidgetComponentViewModel.cs
similarity index 56%
rename from Hyperbar/Lifecycles/IWidgetComponentViewModel.cs
rename to Hyperbar/Views/IWidgetComponentViewModel.cs
index aa26af7..3906cb9 100644
--- a/Hyperbar/Lifecycles/IWidgetComponentViewModel.cs
+++ b/Hyperbar/Views/IWidgetComponentViewModel.cs
@@ -1,6 +1,6 @@
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public interface IWidgetComponentViewModel
 {
 
-}
+}
\ No newline at end of file
diff --git a/Hyperbar/Extensions/IWidgetView.cs b/Hyperbar/Views/IWidgetView.cs
similarity index 100%
rename from Hyperbar/Extensions/IWidgetView.cs
rename to Hyperbar/Views/IWidgetView.cs
diff --git a/Hyperbar/Lifecycles/IWidgetViewModel.cs b/Hyperbar/Views/IWidgetViewModel.cs
similarity index 54%
rename from Hyperbar/Lifecycles/IWidgetViewModel.cs
rename to Hyperbar/Views/IWidgetViewModel.cs
index ae6debb..34e8627 100644
--- a/Hyperbar/Lifecycles/IWidgetViewModel.cs
+++ b/Hyperbar/Views/IWidgetViewModel.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Lifecycles;
+namespace Hyperbar;
 
 public interface IWidgetViewModel
 {
diff --git a/Hyperbar/Views/ObservableCollectionViewModel.cs b/Hyperbar/Views/ObservableCollectionViewModel.cs
new file mode 100644
index 0000000..20898f3
--- /dev/null
+++ b/Hyperbar/Views/ObservableCollectionViewModel.cs
@@ -0,0 +1,48 @@
+using System.Collections.ObjectModel;
+
+namespace Hyperbar;
+
+public class ObservableCollectionViewModel<TItem>(IServiceFactory serviceFactory) :
+    ObservableCollection<TItem>
+{
+    public TItem Add()
+    {
+        TItem? item = serviceFactory.Create<TItem>();
+
+        Add(item);
+        return item;
+    }
+
+    public TItem Add<T>(params object?[] parameters) 
+        where T : TItem
+    {
+        T? item = serviceFactory.Create<T>(parameters);
+        Add(item);
+
+        return item;
+    }
+
+    public TItem Add<T>()
+        where T :
+        TItem
+    {
+        T? item = serviceFactory.Create<T>();
+        Add(item);
+
+        return item;
+    }
+
+    public void AddRange(IEnumerable<TItem> items)
+    {
+        foreach (TItem? item in items)
+        {
+            Add(item);
+        }
+    }
+}
+
+public class ObservableCollectionViewModel(IServiceFactory serviceFactory) :
+    ObservableCollectionViewModel<object>(serviceFactory)
+{
+
+}
diff --git a/Hyperbar/Views/WidgetButtonViewModel.cs b/Hyperbar/Views/WidgetButtonViewModel.cs
new file mode 100644
index 0000000..9d5033c
--- /dev/null
+++ b/Hyperbar/Views/WidgetButtonViewModel.cs
@@ -0,0 +1,25 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace Hyperbar;
+
+public partial class WidgetButtonViewModel :
+    WidgetComponentViewModelBase
+{
+    [ObservableProperty]
+    private string? icon;
+
+    [ObservableProperty]
+    private IRelayCommand? click;
+
+    public WidgetButtonViewModel(ITemplateFactory templateFactory,
+        string? icon = null,
+        Action? action = null) : base(templateFactory)
+    {
+        this.icon = icon;
+        if (action is not null)
+        {
+            click = new RelayCommand(action);
+        }
+    }
+}
diff --git a/Hyperbar/Views/WidgetComponentViewModelBase.cs b/Hyperbar/Views/WidgetComponentViewModelBase.cs
new file mode 100644
index 0000000..ec5c82c
--- /dev/null
+++ b/Hyperbar/Views/WidgetComponentViewModelBase.cs
@@ -0,0 +1,11 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Hyperbar;
+
+public partial class WidgetComponentViewModelBase(ITemplateFactory templateFactory) :
+    ObservableObject,
+    IWidgetComponentViewModel,
+    ITemplatedViewModel
+{
+    public ITemplateFactory TemplateFactory => templateFactory;
+}
diff --git a/Hyperbar/Views/WidgetViewModelBase.cs b/Hyperbar/Views/WidgetViewModelBase.cs
new file mode 100644
index 0000000..303d8d3
--- /dev/null
+++ b/Hyperbar/Views/WidgetViewModelBase.cs
@@ -0,0 +1,10 @@
+namespace Hyperbar;
+
+public class WidgetViewModelBase(ITemplateFactory templateFactory,
+    IServiceFactory serviceFactory) :
+    ObservableCollectionViewModel<IWidgetComponentViewModel>(serviceFactory),
+    IWidgetViewModel,
+    ITemplatedViewModel
+{
+    public ITemplateFactory TemplateFactory => templateFactory;
+}