diff --git a/LIvecoding-uwp/Livecoding/App.xaml b/LIvecoding-uwp/Livecoding/App.xaml
index e1c5fef..77fce28 100644
--- a/LIvecoding-uwp/Livecoding/App.xaml
+++ b/LIvecoding-uwp/Livecoding/App.xaml
@@ -504,6 +504,7 @@
                                             </Storyboard>
                                         </VisualState>
                                     </VisualStateGroup>
+                                    
 
                                     <!-- VolumeMute states -->
                                     <VisualStateGroup x:Name="VolumeMuteStates">
@@ -733,6 +734,18 @@
                                                                 <FontIcon Glyph="&#xEC57;"/>
                                                             </AppBarButton.Icon>
                                                         </AppBarButton>
+                                                        <AppBarButton x:Name="ChatButton"
+                                                                      
+                                                                      MediaTransportControlsHelper.DropoutOrder ="5"
+                                                                      Visibility="Collapsed"
+                                                                      Command="ChatVisibilityChange">
+                                                            <AppBarButton.Icon>
+                                                                <FontIcon Glyph="comment"/>
+                                                            </AppBarButton.Icon>
+                                                        </AppBarButton>
+
+
+
                                                     </CommandBar.PrimaryCommands>
                                                 </CommandBar>
                                             </Border>
diff --git a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
index 465c307..524e081 100644
--- a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
+++ b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
@@ -3,12 +3,15 @@
 using LivecodingApi.Services;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.ApplicationModel.Chat;
 using Windows.ApplicationModel.Core;
 using Windows.Media.Core;
 using Windows.UI.Core;
+using Windows.UI.Xaml.Controls;
 
 namespace Livecoding.UWP.ViewModels
 {
@@ -21,6 +24,14 @@ public class StreamViewModel : ViewModelBase
         #endregion
 
         #region Properties
+        public ObservableCollection<ChatMessage> Messages { get; } = new ObservableCollection<ChatMessage>();
+
+        private bool _showChat;
+        public bool ShowChat
+        {
+            get { return _showChat; }
+            set { _showChat = value; RaisePropertyChanged(); }
+        }
 
         private string _title;
         public string Title
diff --git a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
index 81cd77a..d6af851 100644
--- a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
+++ b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
@@ -7,6 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:lvcontrols="using:Livecoding.UWP.Controls"
     xmlns:usercontrols="using:Livecoding.UWP.UserControls"
+    xmlns:controls="using:Windows.UI.Xaml.Controls"
     mc:Ignorable="d"
     DataContext="{Binding Stream, Source={StaticResource Locator}}"
     NavigationCacheMode="Required">
@@ -23,11 +24,22 @@
                         <lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
                             <DataTemplate>
                                 <usercontrols:StreamHeaderControl DataContext="{Binding Stream, Source={StaticResource Locator}}" />
+
+                                
                             </DataTemplate>
                         </lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
                     </lvcontrols:LivecodingMediaTransportControls>
+
                 </MediaPlayerElement.TransportControls>
+
+
+
             </MediaPlayerElement>
+
+
+
+            
+
         </Grid>
     </Grid>
 </Page>
diff --git a/LIvecoding-uwp/Livecoding/project.json b/LIvecoding-uwp/Livecoding/project.json
index e4912a7..b234d12 100644
--- a/LIvecoding-uwp/Livecoding/project.json
+++ b/LIvecoding-uwp/Livecoding/project.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
-    "livecoding-api-pcl": "1.1.10",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "Microsoft.Services.Store.SDK": "10.1610.31001",
-    "Microsoft.Toolkit.Uwp": "1.3.0-dev00165",
-    "Microsoft.Toolkit.Uwp.UI.Controls": "1.3.0-dev00165",
+    "livecoding-api-pcl": "1.1.11",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.2",
+    "Microsoft.Services.Store.SDK": "10.1703.19001",
+    "Microsoft.Toolkit.Uwp": "1.4.1",
+    "Microsoft.Toolkit.Uwp.UI.Controls": "1.4.1",
     "Microsoft.Xaml.Behaviors.Uwp.Managed": "2.0.0",
-    "MvvmLightLibs": "5.3.0"
+    "MvvmLightLibs": "5.3.0",
+    "XMPP": "0.7.0.21"
   },
   "frameworks": {
     "uap10.0": {}