diff --git a/UndoAssessment.sln b/UndoAssessment.sln
index 35ed5ae..0925577 100644
--- a/UndoAssessment.sln
+++ b/UndoAssessment.sln
@@ -1,60 +1,61 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 25.0.1705.6
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33723.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.Android", "UndoAssessment\UndoAssessment.Android\UndoAssessment.Android.csproj", "{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment.iOS", "UndoAssessment\UndoAssessment.iOS\UndoAssessment.iOS.csproj", "{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UndoAssessment", "UndoAssessment\UndoAssessment\UndoAssessment.csproj", "{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Release|iPhoneSimulator = Release|iPhoneSimulator
 		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|Any CPU = Release|Any CPU
 		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhone.Build.0 = Release|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B08F8340-7FAF-4AB2-A9DA-BA5B14FE5FDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhone.Build.0 = Debug|iPhone
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhone.ActiveCfg = Release|iPhone
 		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhone.Build.0 = Release|iPhone
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{4F77CCCB-68DC-4CC7-A528-DB6FF48741D0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhone.ActiveCfg = Release|Any CPU
 		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhone.Build.0 = Release|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7ED4972A-D279-4E63-B4F5-3D15590D4AA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/UndoAssessment/UndoAssessment/App.xaml.cs b/UndoAssessment/UndoAssessment/App.xaml.cs
index 254aae8..efe8e58 100644
--- a/UndoAssessment/UndoAssessment/App.xaml.cs
+++ b/UndoAssessment/UndoAssessment/App.xaml.cs
@@ -1,31 +1,32 @@
-using System;
+using UndoAssessment.Services;
+using UndoAssessment.Services.DataProvider;
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-using UndoAssessment.Services;
-using UndoAssessment.Views;
 
 namespace UndoAssessment
 {
     public partial class App : Application
     {
 
-        public App ()
+        public App()
         {
             InitializeComponent();
 
-            DependencyService.Register<MockDataStore>();
+            DependencyService.Register<MockItemDataStore>();
+            DependencyService.Register<MockUserDataStore>();
+            DependencyService.Register<DataProvider>();
+
             MainPage = new AppShell();
         }
 
-        protected override void OnStart ()
+        protected override void OnStart()
         {
         }
 
-        protected override void OnSleep ()
+        protected override void OnSleep()
         {
         }
 
-        protected override void OnResume ()
+        protected override void OnResume()
         {
         }
     }
diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml b/UndoAssessment/UndoAssessment/AppShell.xaml
index 9b3603b..40ed658 100644
--- a/UndoAssessment/UndoAssessment/AppShell.xaml
+++ b/UndoAssessment/UndoAssessment/AppShell.xaml
@@ -32,6 +32,7 @@
     <TabBar>
         <ShellContent Title="About" Icon="icon_about.png" Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
         <ShellContent Title="Browse" Icon="icon_feed.png" ContentTemplate="{DataTemplate local:ItemsPage}" />
+        <ShellContent Title="Users" ContentTemplate="{DataTemplate local:UsersPage}" />
     </TabBar>
 
     <!--
diff --git a/UndoAssessment/UndoAssessment/AppShell.xaml.cs b/UndoAssessment/UndoAssessment/AppShell.xaml.cs
index abbe3ed..0c2a356 100644
--- a/UndoAssessment/UndoAssessment/AppShell.xaml.cs
+++ b/UndoAssessment/UndoAssessment/AppShell.xaml.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using UndoAssessment.ViewModels;
-using UndoAssessment.Views;
+using UndoAssessment.Views;
 using Xamarin.Forms;
 
 namespace UndoAssessment
@@ -11,10 +8,12 @@ public partial class AppShell : Xamarin.Forms.Shell
         public AppShell()
         {
             InitializeComponent();
+
             Routing.RegisterRoute(nameof(ItemDetailPage), typeof(ItemDetailPage));
             Routing.RegisterRoute(nameof(NewItemPage), typeof(NewItemPage));
+            Routing.RegisterRoute(nameof(UserDetailPage), typeof(UserDetailPage));
+            Routing.RegisterRoute(nameof(NewUserPage), typeof(NewUserPage));
         }
-
     }
 }
 
diff --git a/UndoAssessment/UndoAssessment/Converters/InverseBoolConverter.cs b/UndoAssessment/UndoAssessment/Converters/InverseBoolConverter.cs
new file mode 100644
index 0000000..2427468
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Converters/InverseBoolConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using Xamarin.Forms;
+
+namespace UndoAssessment.Converters
+{
+    //ToDo: the converter can be replace from the Xamarin Community Toolkit package
+    public class InverseBoolConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return !(bool)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Models/IEntity.cs b/UndoAssessment/UndoAssessment/Models/IEntity.cs
new file mode 100644
index 0000000..7a8c5e6
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Models/IEntity.cs
@@ -0,0 +1,7 @@
+namespace UndoAssessment.Models
+{
+    public interface IEntity
+    {
+        string Id { get; set; }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Models/Item.cs b/UndoAssessment/UndoAssessment/Models/Item.cs
index e0c317a..eec032b 100644
--- a/UndoAssessment/UndoAssessment/Models/Item.cs
+++ b/UndoAssessment/UndoAssessment/Models/Item.cs
@@ -1,8 +1,6 @@
-using System;
-
-namespace UndoAssessment.Models
+namespace UndoAssessment.Models
 {
-    public class Item
+    public class Item : IEntity
     {
         public string Id { get; set; }
         public string Text { get; set; }
diff --git a/UndoAssessment/UndoAssessment/Models/User.cs b/UndoAssessment/UndoAssessment/Models/User.cs
new file mode 100644
index 0000000..4ffed8d
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Models/User.cs
@@ -0,0 +1,9 @@
+namespace UndoAssessment.Models
+{
+    public class User : IEntity
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public uint Age { get; set; }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/ApiResponse.cs b/UndoAssessment/UndoAssessment/Services/ApiResponse.cs
new file mode 100644
index 0000000..e08430d
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/ApiResponse.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace UndoAssessment.Services
+{
+    public class ApiResponse
+    {
+        public bool IsSuccess { get; set; }
+        public string ErrorMessage { get; set; }
+        public ApiResponseModel Result { get; set; }
+    }
+
+    public class ApiResponseModel
+    {
+        public string Message { get; set; }
+        public DateTime Date { get; set; }
+
+        public override string ToString()
+        {
+            return $"Message: {Message}, date: {Date}";
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/DataProvider/DataProvider.cs b/UndoAssessment/UndoAssessment/Services/DataProvider/DataProvider.cs
new file mode 100644
index 0000000..092a255
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/DataProvider/DataProvider.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+
+namespace UndoAssessment.Services.DataProvider
+{
+    internal class DataProvider : IDataProvider
+    {
+        private const string Url = "https://malkarakundostagingpublicapi.azurewebsites.net/";
+        private const string SuccessPartUrl = "success";
+        private const string FailPartUrl = "fail";
+
+        public async Task<IEnumerable<Item>> GetItems()
+        {
+            var items = Enumerable.Range(0, 11)
+                            .Select(ind =>
+                                new Item
+                                {
+                                    Id = ind.ToString(),
+                                    Text = ind.ToString(),
+                                    Description = ind.ToString()
+                                });
+
+            return await Task.FromResult(items);
+        }
+
+        public async Task<ApiResponse> MakeApiRequest(bool flag)
+        {
+            try
+            {
+                using (HttpClient client = new HttpClient())
+                {
+                    var urlformat = $"{Url}{(flag ? SuccessPartUrl : FailPartUrl)}";
+                    var response = await client.GetAsync(urlformat);
+
+                    if (response.IsSuccessStatusCode)
+                    {
+                        var responseBody = await response.Content.ReadAsStringAsync();
+                        var result = ParseResponse(responseBody);
+
+                        return new ApiResponse
+                        {
+                            IsSuccess = true,
+                            Result = result
+                        };
+                    }
+                    else
+                    {
+                        // Read the error message from the response
+                        var errorMessage = await response.Content.ReadAsStringAsync();
+
+                        // Return an error result with the error message
+                        return new ApiResponse
+                        {
+                            IsSuccess = false,
+                            ErrorMessage = errorMessage
+                        };
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return new ApiResponse
+                {
+                    IsSuccess = false,
+                    ErrorMessage = ex.Message
+                };
+            }
+        }
+
+        private static ApiResponseModel ParseResponse(string responseBody)
+        {
+            // ToDo: it can be replace to JsonConvert, it for needs install a package
+            // {\"message\":\"Success message\",\"date\":\"11.07.2023 12:50:30\"}
+            // var data = JsonConvert.DeserializeObject<ApiResponseModel>(responseBody);
+            // return new ApiResponseModel()
+            // {
+            //     Message = date.Message,
+            //     Date = date.Date
+            // };
+
+            // Fictitious response
+            return new ApiResponseModel()
+            {
+                Message = "Success message",
+                Date = DateTime.UtcNow
+            };
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/DataProvider/IDataProvider.cs b/UndoAssessment/UndoAssessment/Services/DataProvider/IDataProvider.cs
new file mode 100644
index 0000000..dcf2a64
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/DataProvider/IDataProvider.cs
@@ -0,0 +1,13 @@
+using UndoAssessment.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace UndoAssessment.Services.DataProvider
+{
+    public interface IDataProvider
+    {
+        Task<IEnumerable<Item>> GetItems();
+
+        Task<ApiResponse> MakeApiRequest(bool flag);
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/MockDataStore.cs b/UndoAssessment/UndoAssessment/Services/MockDataStore.cs
deleted file mode 100644
index f4a318a..0000000
--- a/UndoAssessment/UndoAssessment/Services/MockDataStore.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using UndoAssessment.Models;
-
-namespace UndoAssessment.Services
-{
-    public class MockDataStore : IDataStore<Item>
-    {
-        readonly List<Item> items;
-
-        public MockDataStore()
-        {
-            items = new List<Item>()
-            {
-                new Item { Id = Guid.NewGuid().ToString(), Text = "First item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Second item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Third item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Fourth item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Fifth item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Sixth item", Description="This is an item description." }
-            };
-        }
-
-        public async Task<bool> AddItemAsync(Item item)
-        {
-            items.Add(item);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<bool> UpdateItemAsync(Item item)
-        {
-            var oldItem = items.Where((Item arg) => arg.Id == item.Id).FirstOrDefault();
-            items.Remove(oldItem);
-            items.Add(item);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<bool> DeleteItemAsync(string id)
-        {
-            var oldItem = items.Where((Item arg) => arg.Id == id).FirstOrDefault();
-            items.Remove(oldItem);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<Item> GetItemAsync(string id)
-        {
-            return await Task.FromResult(items.FirstOrDefault(s => s.Id == id));
-        }
-
-        public async Task<IEnumerable<Item>> GetItemsAsync(bool forceRefresh = false)
-        {
-            return await Task.FromResult(items);
-        }
-    }
-}
diff --git a/UndoAssessment/UndoAssessment/Services/MockDataStore/MockDataStore.cs b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockDataStore.cs
new file mode 100644
index 0000000..fd5ec10
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockDataStore.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+
+namespace UndoAssessment.Services
+{
+    public abstract class MockDataStore<T> : IDataStore<T>
+        where T : IEntity
+    {
+        protected List<T> Items;
+
+        public async Task<bool> AddItemAsync(T item)
+        {
+            Items.Add(item);
+
+            return await Task.FromResult(true);
+        }
+
+        public async Task<bool> UpdateItemAsync(T item)
+        {
+            var oldItem = Items.Where(arg => arg.Id == item.Id).FirstOrDefault();
+
+            Items.Remove(oldItem);
+            Items.Add(item);
+
+            return await Task.FromResult(true);
+        }
+
+        public async Task<bool> DeleteItemAsync(string id)
+        {
+            var oldItem = Items.Where(arg => arg.Id == id).FirstOrDefault();
+
+            Items.Remove(oldItem);
+
+            return await Task.FromResult(true);
+        }
+
+        public async Task<T> GetItemAsync(string id)
+        {
+            return await Task.FromResult(Items.FirstOrDefault(s => s.Id == id));
+        }
+
+        public async Task<IEnumerable<T>> GetItemsAsync(bool forceRefresh = false)
+        {
+            return await Task.FromResult(Items);
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/MockDataStore/MockItemDataStore.cs b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockItemDataStore.cs
new file mode 100644
index 0000000..3c73354
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockItemDataStore.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using UndoAssessment.Models;
+
+namespace UndoAssessment.Services
+{
+    public class MockItemDataStore : MockDataStore<Item>
+    {
+        public MockItemDataStore()
+        {
+            Items = new List<Item>()
+            {
+                new Item { Id = Guid.NewGuid().ToString(), Text = "First item", Description="This is an item description." },
+                new Item { Id = Guid.NewGuid().ToString(), Text = "Second item", Description="This is an item description." },
+                new Item { Id = Guid.NewGuid().ToString(), Text = "Third item", Description="This is an item description." },
+                new Item { Id = Guid.NewGuid().ToString(), Text = "Fourth item", Description="This is an item description." },
+                new Item { Id = Guid.NewGuid().ToString(), Text = "Fifth item", Description="This is an item description." },
+                new Item { Id = Guid.NewGuid().ToString(), Text = "Sixth item", Description="This is an item description." }
+            };
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Services/MockDataStore/MockUserDataStore.cs b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockUserDataStore.cs
new file mode 100644
index 0000000..19ea4a7
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Services/MockDataStore/MockUserDataStore.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using UndoAssessment.Models;
+
+namespace UndoAssessment.Services
+{
+    public class MockUserDataStore : MockDataStore<User>
+    {
+        public MockUserDataStore()
+        {
+            Items = new List<User>()
+            {
+                new User { Id = Guid.NewGuid().ToString(), Name = "Andrii", Age = 32 },
+                new User { Id = Guid.NewGuid().ToString(), Name = "Smitt", Age = 30 },
+                new User { Id = Guid.NewGuid().ToString(), Name = "Boris", Age = 55 }
+            };
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs
index e4ee974..da754c6 100644
--- a/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs
+++ b/UndoAssessment/UndoAssessment/ViewModels/BaseViewModel.cs
@@ -7,12 +7,15 @@
 
 using UndoAssessment.Models;
 using UndoAssessment.Services;
+using UndoAssessment.Services.DataProvider;
 
 namespace UndoAssessment.ViewModels
 {
     public class BaseViewModel : INotifyPropertyChanged
     {
-        public IDataStore<Item> DataStore => DependencyService.Get<IDataStore<Item>>();
+        public IDataStore<Item> ItemsDataStore => DependencyService.Get<IDataStore<Item>>();
+        public IDataStore<User> UserDataStore => DependencyService.Get<IDataStore<User>>();
+        public IDataProvider DataProvider => DependencyService.Get<IDataProvider>();
 
         bool isBusy = false;
         public bool IsBusy
@@ -29,7 +32,7 @@ public string Title
         }
 
         protected bool SetProperty<T>(ref T backingStore, T value,
-            [CallerMemberName]string propertyName = "",
+            [CallerMemberName] string propertyName = "",
             Action onChanged = null)
         {
             if (EqualityComparer<T>.Default.Equals(backingStore, value))
diff --git a/UndoAssessment/UndoAssessment/ViewModels/CollectionViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/CollectionViewModel.cs
new file mode 100644
index 0000000..fc0c939
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/CollectionViewModel.cs
@@ -0,0 +1,72 @@
+using UndoAssessment.Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+
+namespace UndoAssessment.ViewModels
+{
+    public abstract class CollectionViewModel<T> : BaseViewModel
+        where T : IEntity
+    {
+        public ObservableCollection<T> Items { get; }
+
+        public Command AddItemCommand { get; }
+        public Command LoadItemsCommand { get; }
+        public Command<T> ItemTapped { get; }
+
+        protected abstract Task<IEnumerable<T>> LoadDataStore();
+        protected abstract void OnAddItem(object obj);
+        protected abstract void OnItemSelected(T item);
+
+        public CollectionViewModel()
+        {
+            Items = new ObservableCollection<T>();
+            AddItemCommand = new Command(OnAddItem);
+            LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand());
+            ItemTapped = new Command<T>(OnItemSelected);
+        }
+
+        private async Task ExecuteLoadItemsCommand()
+        {
+            IsBusy = true;
+
+            try
+            {
+                Items.Clear();
+
+                var items = await LoadDataStore();
+
+                items.ForEach(x => Items.Add(x));
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+            }
+            finally
+            {
+                IsBusy = false;
+            }
+        }
+
+        private IEntity _selectedItem;
+        public IEntity SelectedItem
+        {
+            get => _selectedItem;
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                OnItemSelected((T)value);
+            }
+        }
+
+        public void OnAppearing()
+        {
+            IsBusy = true;
+            SelectedItem = null;
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs
index 46f210d..427b65b 100644
--- a/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs
+++ b/UndoAssessment/UndoAssessment/ViewModels/ItemDetailViewModel.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Threading.Tasks;
-using UndoAssessment.Models;
 using Xamarin.Forms;
 
 namespace UndoAssessment.ViewModels
@@ -28,22 +26,19 @@ public string Description
 
         public string ItemId
         {
-            get
-            {
-                return itemId;
-            }
+            get => itemId;
             set
             {
                 itemId = value;
                 LoadItemId(value);
             }
-        }        
+        }
 
         public async void LoadItemId(string itemId)
         {
             try
             {
-                var item = await DataStore.GetItemAsync(itemId);
+                var item = await ItemsDataStore.GetItemAsync(itemId);
                 Id = item.Id;
                 Text = item.Text;
                 Description = item.Description;
diff --git a/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs
index 73165fc..0cada85 100644
--- a/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs
+++ b/UndoAssessment/UndoAssessment/ViewModels/ItemsViewModel.cs
@@ -1,80 +1,29 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
 using UndoAssessment.Models;
 using UndoAssessment.Views;
+using Xamarin.Forms;
 
 namespace UndoAssessment.ViewModels
 {
-    public class ItemsViewModel : BaseViewModel
+    public class ItemsViewModel : CollectionViewModel<Item>
     {
-        private Item _selectedItem;
-
-        public ObservableCollection<Item> Items { get; }
-        public Command LoadItemsCommand { get; }
-        public Command AddItemCommand { get;  }
-        public Command<Item> ItemTapped { get; }
-
         public ItemsViewModel()
         {
             Title = "Browse";
-            Items = new ObservableCollection<Item>();
-            LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand());
-
-            ItemTapped = new Command<Item>(OnItemSelected);
-
-            AddItemCommand = new Command(OnAddItem);
-        }
-
-        async Task ExecuteLoadItemsCommand()
-        {
-            IsBusy = true;
-
-            try
-            {
-                Items.Clear();
-                var items = await DataStore.GetItemsAsync(true);
-                foreach (var item in items)
-                {
-                    Items.Add(item);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex);
-            }
-            finally
-            {
-                IsBusy = false;
-            }
-        }
-
-        public void OnAppearing()
-        {
-            IsBusy = true;
-            SelectedItem = null;
         }
 
-        public Item SelectedItem
+        protected override async Task<IEnumerable<Item>> LoadDataStore()
         {
-            get => _selectedItem;
-            set
-            {
-                SetProperty(ref _selectedItem, value);
-                OnItemSelected(value);
-            }
+            return await ItemsDataStore.GetItemsAsync(true);
         }
 
-        private async void OnAddItem(object obj)
+        protected override async void OnAddItem(object obj)
         {
             await Shell.Current.GoToAsync(nameof(NewItemPage));
         }
 
-        async void OnItemSelected(Item item)
+        protected override async void OnItemSelected(Item item)
         {
             if (item == null)
                 return;
diff --git a/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs
index 2365c77..3c5930b 100644
--- a/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs
+++ b/UndoAssessment/UndoAssessment/ViewModels/NewItemViewModel.cs
@@ -16,7 +16,7 @@ public NewItemViewModel()
         {
             SaveCommand = new Command(OnSave, ValidateSave);
             CancelCommand = new Command(OnCancel);
-            this.PropertyChanged += 
+            this.PropertyChanged +=
                 (_, __) => SaveCommand.ChangeCanExecute();
         }
 
@@ -55,8 +55,8 @@ private async void OnSave()
                 Text = Text,
                 Description = Description
             };
-            
-            await DataStore.AddItemAsync(newItem);
+
+            await ItemsDataStore.AddItemAsync(newItem);
 
             // This will pop the current page off the navigation stack
             await Shell.Current.GoToAsync("..");
diff --git a/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs
new file mode 100644
index 0000000..1079e57
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/NewUserViewModel.cs
@@ -0,0 +1,61 @@
+using System;
+using UndoAssessment.Models;
+using Xamarin.Forms;
+
+namespace UndoAssessment.ViewModels
+{
+    public class NewUserViewModel : BaseViewModel
+    {
+        public Command SubmitCommand { get; }
+
+        public Command CancelCommand { get; }
+
+        public NewUserViewModel()
+        {
+            SubmitCommand = new Command(OnSubmit, ValidateSubmit);
+            CancelCommand = new Command(OnCancel);
+
+            this.PropertyChanged +=
+                (_, __) => SubmitCommand.ChangeCanExecute();
+        }
+
+        private bool ValidateSubmit()
+        {
+            return !String.IsNullOrWhiteSpace(_name)
+                && !String.IsNullOrWhiteSpace(_age);
+        }
+
+        private async void OnSubmit()
+        {
+            var newUser = new User()
+            {
+                Id = Guid.NewGuid().ToString(),
+                Name = Name,
+                Age = uint.Parse(Age)
+            };
+
+            await UserDataStore.AddItemAsync(newUser);
+
+            await Shell.Current.GoToAsync("..");
+        }
+
+        private async void OnCancel()
+        {
+            await Shell.Current.GoToAsync("..");
+        }
+
+        private string _name;
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+
+        private string _age = null;
+        public string Age
+        {
+            get => _age;
+            set => SetProperty(ref _age, value);
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/ViewModels/UserDetailViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/UserDetailViewModel.cs
new file mode 100644
index 0000000..e1a8d64
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/UserDetailViewModel.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Diagnostics;
+using Xamarin.Forms;
+
+namespace UndoAssessment.ViewModels
+{
+    [QueryProperty(nameof(UserId), nameof(UserId))]
+    public class UserDetailViewModel : BaseViewModel
+    {
+        private string _userId;
+        private string _name;
+        private uint _age;
+        public string Id { get; set; }
+
+        public string Name
+        {
+            get => _name;
+            set => SetProperty(ref _name, value);
+        }
+
+        public uint Age
+        {
+            get => _age;
+            set => SetProperty(ref _age, value);
+        }
+
+        public string UserId
+        {
+            get => _userId;
+            set
+            {
+                _userId = value;
+                LoadUserId(value);
+            }
+        }
+
+        public async void LoadUserId(string itemId)
+        {
+            try
+            {
+                var item = await UserDataStore.GetItemAsync(itemId);
+
+                Id = item.Id;
+                Name = item.Name;
+                Age = item.Age;
+            }
+            catch (Exception)
+            {
+                Debug.WriteLine("Failed to Load User");
+            }
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/ViewModels/UsersViewModel.cs b/UndoAssessment/UndoAssessment/ViewModels/UsersViewModel.cs
new file mode 100644
index 0000000..deed61b
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/ViewModels/UsersViewModel.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using UndoAssessment.Models;
+using UndoAssessment.Views;
+using Xamarin.Forms;
+
+namespace UndoAssessment.ViewModels
+{
+    internal class UsersViewModel : CollectionViewModel<User>
+    {
+        public Command ButtonCommand { get; }
+
+        public UsersViewModel()
+        {
+            Title = "Users";
+
+            ButtonCommand = new Command<bool>(OnFirstClicked);
+        }
+
+        private async void OnFirstClicked(bool flag)
+        {
+            await MakeApiCall(flag);
+        }
+
+        public async Task MakeApiCall(bool flag)
+        {
+            if (flag)
+                IsSuccessBusyVisible = true;
+            else
+                IsFailBusyVisible = true;
+
+            try
+            {
+                var response = await DataProvider.MakeApiRequest(flag);
+
+                // Check if the API call was successful
+                if (response.IsSuccess)
+                {
+                    // Show success message
+                    await ShowAlert("Success", $"API call was successful: {response.Result}");
+                }
+                else
+                {
+                    // Show error message
+                    await ShowAlert("Error", response.ErrorMessage);
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex);
+                await ShowAlert("Error", ex.Message);
+            }
+            finally
+            {
+                IsSuccessBusyVisible = false;
+                IsFailBusyVisible = false;
+            }
+        }
+
+        bool _isSuccessBusyVisible = false;
+        public bool IsSuccessBusyVisible
+        {
+            get => _isSuccessBusyVisible;
+            set => SetProperty(ref _isSuccessBusyVisible, value);
+        }
+
+        bool _isFailBusyVisible = false;
+        public bool IsFailBusyVisible
+        {
+            get => _isFailBusyVisible;
+            set => SetProperty(ref _isFailBusyVisible, value);
+        }
+
+        public async Task ShowAlert(string title, string message)
+        {
+            await Application.Current.MainPage.DisplayAlert(title, message, "OK");
+        }
+
+        protected override async Task<IEnumerable<User>> LoadDataStore()
+        {
+            return await UserDataStore.GetItemsAsync(true);
+        }
+
+        protected override async void OnAddItem(object obj)
+        {
+            await Shell.Current.GoToAsync(nameof(NewUserPage));
+        }
+
+        protected override async void OnItemSelected(User item)
+        {
+            if (item == null)
+                return;
+
+            await Shell.Current.GoToAsync($"{nameof(UserDetailPage)}?{nameof(UserDetailViewModel.UserId)}={item.Id}");
+        }
+    }
+}
diff --git a/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml b/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml
new file mode 100644
index 0000000..1ea80fe
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             Shell.PresentationMode="ModalAnimated"
+             Title="A Form"
+             x:Class="UndoAssessment.Views.NewUserPage">
+    <ContentPage.Content>
+        <StackLayout Spacing="3" Padding="15">
+            <Label Text="Name" />
+            <Entry Text="{Binding Name}" />
+            <Label Text="Age" />
+            <!-- for simplicity -->
+            <Entry x:Name="AgeEntry" Keyboard="Numeric" Text="{Binding Age}" />
+
+            <!-- There as alternativy, may add <xct:TextValidationBehavior, but for it need install the Xamarin Community Toolkit package -->
+            <!--<Entry x:Name="AgeEntry" Keyboard="Numeric" Text="{Binding Age}">
+                <Entry.Behaviors>
+                    <local:NumericValidationBehavior />
+                </Entry.Behaviors>
+            </Entry>-->
+
+            <StackLayout Orientation="Horizontal">
+                <Button Text="Cancel" Command="{Binding CancelCommand}" HorizontalOptions="FillAndExpand"></Button>
+                <Button Text="Submit" Command="{Binding SubmitCommand}" HorizontalOptions="FillAndExpand"></Button>
+            </StackLayout>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml.cs
new file mode 100644
index 0000000..a143224
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/NewUserPage.xaml.cs
@@ -0,0 +1,17 @@
+using UndoAssessment.ViewModels;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace UndoAssessment.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class NewUserPage : ContentPage
+    {
+        public NewUserPage()
+        {
+            InitializeComponent();
+
+            BindingContext = new NewUserViewModel();
+        }
+    }
+}
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml b/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml
new file mode 100644
index 0000000..8f97ca4
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndoAssessment.Views.UserDetailPage"
+             Title="{Binding Title}">
+    <StackLayout Spacing="20" Padding="15">
+        <Label Text="Name:" FontSize="Medium" />
+        <Label Text="{Binding Name}" FontSize="Small"/>
+        <Label Text="Age:" FontSize="Medium" />
+        <Label Text="{Binding Age}" FontSize="Small"/>
+    </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml.cs
new file mode 100644
index 0000000..4b8123d
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/UserDetailPage.xaml.cs
@@ -0,0 +1,17 @@
+using UndoAssessment.ViewModels;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace UndoAssessment.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class UserDetailPage : ContentPage
+    {
+        public UserDetailPage()
+        {
+            InitializeComponent();
+
+            BindingContext = new UserDetailViewModel();
+        }
+    }
+}
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/UsersPage.xaml b/UndoAssessment/UndoAssessment/Views/UsersPage.xaml
new file mode 100644
index 0000000..c1ff997
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/UsersPage.xaml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndoAssessment.Views.UsersPage"
+             xmlns:converters="clr-namespace:UndoAssessment.Converters;assembly=UndoAssessment"
+             xmlns:local="clr-namespace:UndoAssessment.ViewModels"
+             xmlns:model="clr-namespace:UndoAssessment.Models"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib">
+    <ContentPage.Resources>
+        <sys:Boolean x:Key="TrueValue">True</sys:Boolean>
+        <sys:Boolean x:Key="FalseValue">False</sys:Boolean>
+        <!-- ToDo: The converter can be replace from the Xamarin Community Toolkit package -->
+        <converters:InverseBoolConverter x:Key="inverter" />
+    </ContentPage.Resources>
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="ADD" Command="{Binding AddItemCommand}" />
+    </ContentPage.ToolbarItems>
+    <ContentPage.Content>
+        <Grid>
+            <StackLayout Padding="10">
+                <RefreshView x:DataType="local:UsersViewModel"
+                             Command="{Binding LoadItemsCommand}"
+                             IsRefreshing="{Binding IsBusy, Mode=TwoWay}">
+                    <CollectionView x:Name="ItemsListView"
+                                    ItemsSource="{Binding Items}"
+                                    SelectionMode="None">
+                        <CollectionView.ItemTemplate>
+                            <DataTemplate>
+                                <StackLayout Padding="10" x:DataType="model:User">
+                                    <Label Text="{Binding Name}" 
+                                           LineBreakMode="NoWrap"
+                                           Style="{DynamicResource ListItemTextStyle}" 
+                                           FontSize="16" />
+                                    <Label Text="{Binding Age}" 
+                                           LineBreakMode="NoWrap"
+                                           Style="{DynamicResource ListItemDetailTextStyle}"
+                                           FontSize="13" />
+                                    <StackLayout.GestureRecognizers>
+                                        <TapGestureRecognizer NumberOfTapsRequired="1"
+                                                              Command="{Binding Source={RelativeSource AncestorType={x:Type local:UsersViewModel}}, Path=ItemTapped}"		
+                                                              CommandParameter="{Binding .}">
+                                        </TapGestureRecognizer>
+                                    </StackLayout.GestureRecognizers>
+                                </StackLayout>
+                            </DataTemplate>
+                        </CollectionView.ItemTemplate>
+                    </CollectionView>
+                </RefreshView>
+
+                <StackLayout Orientation="Horizontal"
+                             VerticalOptions="CenterAndExpand"
+                             HorizontalOptions="CenterAndExpand">
+                    <Grid HorizontalOptions="FillAndExpand">
+                        <Button Text="Success" Command="{Binding ButtonCommand}" IsVisible="{Binding IsSuccessBusyVisible, Converter={x:StaticResource inverter}}" CommandParameter="{StaticResource TrueValue}" />
+                        <StackLayout IsVisible="{Binding IsSuccessBusyVisible}" BackgroundColor="Black" Opacity="0.3" />
+                        <ActivityIndicator IsVisible="{Binding IsSuccessBusyVisible}" IsRunning="{Binding IsSuccessBusyVisible}" VerticalOptions="CenterAndExpand" />
+                    </Grid>
+                    <Grid HorizontalOptions="FillAndExpand">
+                        <Button Text="Fail" Command="{Binding ButtonCommand}" IsVisible="{Binding IsFailBusyVisible, Converter={x:StaticResource inverter}}" CommandParameter="{StaticResource FalseValue}" />
+                        <StackLayout IsVisible="{Binding IsFailBusyVisible}" BackgroundColor="Black" Opacity="0.3" />
+                        <ActivityIndicator IsVisible="{Binding IsFailBusyVisible}" IsRunning="{Binding IsFailBusyVisible}" VerticalOptions="CenterAndExpand" />
+                    </Grid>
+                </StackLayout>
+            </StackLayout>
+        </Grid>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/UndoAssessment/UndoAssessment/Views/UsersPage.xaml.cs b/UndoAssessment/UndoAssessment/Views/UsersPage.xaml.cs
new file mode 100644
index 0000000..d7d356a
--- /dev/null
+++ b/UndoAssessment/UndoAssessment/Views/UsersPage.xaml.cs
@@ -0,0 +1,24 @@
+using UndoAssessment.ViewModels;
+using Xamarin.Forms;
+
+namespace UndoAssessment.Views
+{
+    public partial class UsersPage : ContentPage
+    {
+        private readonly UsersViewModel _viewModel;
+
+        public UsersPage()
+        {
+            InitializeComponent();
+
+            BindingContext = _viewModel = new UsersViewModel();
+        }
+
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+
+            _viewModel.OnAppearing();
+        }
+    }
+}
\ No newline at end of file