diff --git a/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml b/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml
index b797ca2..5049fb6 100644
--- a/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml
+++ b/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml
@@ -69,14 +69,16 @@
                 Height="50"
                 Background="#2d2d2d"
                 Foreground="White"
-                Grid.Row="2"/>
+                Grid.Row="2"
+                Click="MakeNoteButton_Click"/>
             <Button
                 Content="Make groups for me"
                 Width="400"
                 Height="50"
                 Background="#2d2d2d"
                 Foreground="White"
-                Grid.Row="3"/>
+                Grid.Row="3"
+                Click="MakeGroupButton_Click"/>
             <Button
                 Content="Optimize my graph for me"
                 Width="400"
diff --git a/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml.cs b/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml.cs
index 2ea876f..321bb33 100644
--- a/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml.cs
+++ b/src/DynamoAssistantViewExtension/DynamoAssistantWindow.xaml.cs
@@ -33,5 +33,15 @@ private void WhatsNewButton_Click(object sender, RoutedEventArgs e)
         {
             ViewModel.WhatsNew();
         }
+
+        private void MakeNoteButton_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.MakeNote();
+        }
+
+        private void MakeGroupButton_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.MakeGroup();
+        }
     }
 }
diff --git a/src/DynamoAssistantViewExtension/DynamoAssistantWindowViewModel.cs b/src/DynamoAssistantViewExtension/DynamoAssistantWindowViewModel.cs
index 7ffce3c..c3b475c 100644
--- a/src/DynamoAssistantViewExtension/DynamoAssistantWindowViewModel.cs
+++ b/src/DynamoAssistantViewExtension/DynamoAssistantWindowViewModel.cs
@@ -93,8 +93,6 @@ internal async void SendMessage(string msg)
             {
                 CreatePythonNode(response);
             }
-            // create a Dynamo note example
-            // CreateNote((new Guid()).ToString(), "This is a sample Note.", 0, 0, true);
             IsWaitingForInput = true;
         }
 
@@ -102,7 +100,7 @@ internal async void DescribeGraph()
         {
             // Set Dynamo file location
             string filePath = readyParams.CurrentWorkspaceModel.FileName;
-            if (filePath == null)
+            if (string.IsNullOrEmpty(filePath))
             {
                 // Alternatively, export Json from current workspace model to continue
                 Messages.Add("Copilot:\nPlease save the workspace first.\n");
@@ -148,6 +146,18 @@ internal async void WhatsNew()
             Messages.Add("Copilot:\n" + response + "\n");
         }
 
+        internal void MakeNote()
+        {
+            // create a Dynamo note example
+            CreateNote((new Guid()).ToString(), "This is a sample Note.", 0, 0, true);
+        }
+
+        internal void MakeGroup()
+        {
+            // create a Dynamo group example
+            dynamoModel.ExecuteCommand(new DynamoModel.CreateAnnotationCommand(new Guid(), "This is a sample Group.", string.Empty, 0, 0, true));
+        }
+
         /// <summary>
         /// Create a python node in Dynamo, use latest Nuget package for this
         /// </summary>