diff --git a/Data/Database.cs b/Data/Database.cs
index cf287af..3ce842e 100644
--- a/Data/Database.cs
+++ b/Data/Database.cs
@@ -36,7 +36,7 @@ public async Task CreateTablesAsync()
                 await _database.CreateTableAsync<Models.OperationalTeam>();
                 await _database.CreateTableAsync<Models.BuildingType>();
                 await _database.CreateTableAsync<Models.Continent>();
-                await _database.CreateTableAsync<Models.Equipment>();
+                await _database.CreateTableAsync<Models.AnEquipment>();
                 await _database.CreateTableAsync<Models.OrderStatus>();
                 await _database.CreateTableAsync<Models.Organisation>();
                 await _database.CreateTableAsync<Models.PositionStatuses>();
diff --git a/MauiProgram.cs b/MauiProgram.cs
index d7d9f2b..9c1247c 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -1,8 +1,6 @@
 using UndacApp.Data;
 using UndacApp.Services;
 using Microsoft.Extensions.Logging;
-using UndacApp.Services.Accommodation;
-
 namespace UndacApp;
 
 public static class MauiProgram
@@ -34,11 +32,9 @@ public static MauiApp CreateMauiApp()
         builder.Services.AddSingleton<IResourceTypeService, ResourceTypeService>();
         builder.Services.AddSingleton<IResourceService, ResourceService>();
         builder.Services.AddSingleton<IVolunteerService, VolunteerService>();
-
         builder.Services.AddSingleton<IMethodologicalDocumentationService, MethodologicalDocumentationService>();    
-        
         builder.Services.AddSingleton<ICalendarEventService, CalendarEventService>();
-
+        builder.Services.AddSingleton<IEquipmentService, EquipmentService>();
 
 #if DEBUG
         builder.Logging.AddDebug();
diff --git a/Models/AnEquipment.cs b/Models/AnEquipment.cs
new file mode 100644
index 0000000..6663ab9
--- /dev/null
+++ b/Models/AnEquipment.cs
@@ -0,0 +1,38 @@
+namespace UndacApp.Models
+{
+    /*! <summary>
+        A model structure for Equipment data
+    </summary> 
+    <details>Data is stored in SQLite database.</details> */
+    public class AnEquipment : AModel
+    {
+        private string? _type = String.Empty;
+        public string? Type
+        {
+            get => _type;
+            set => SetField(ref _type, value);
+        }
+
+        private string? _location = String.Empty;
+        public string? Location
+        {
+            get => _location;
+            set => SetField(ref _location, value);
+        }
+
+        private string? _currentOperation = String.Empty;
+        public string? CurrentOperation
+        {
+            get => _currentOperation;
+            set => SetField(ref _currentOperation, value);
+        }
+
+        private int _quantity = 0;
+        public int Quantity
+        {
+            get => _quantity;
+            set => SetField(ref _quantity, value);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Models/Equipment.cs b/Models/Equipment.cs
deleted file mode 100644
index 2f3ca38..0000000
--- a/Models/Equipment.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace UndacApp.Models
-{
-    /*! <summary>
-        A model structure for Equipment data
-    </summary> 
-    <details>Data is stored in SQLite database.</details> */
-    public class Equipment : AModel
-    {
-
-        /*! <summary>
-       A private variable, storing Equipment name
-          </summary> */
-        private string _name;
-        public string Name
-        {
-            get => _name;
-            set => SetField(ref _name, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Services/Accommodation/BuildingTypeService.cs b/Services/Accommodation/BuildingTypeService.cs
index 321aac6..ffdff63 100644
--- a/Services/Accommodation/BuildingTypeService.cs
+++ b/Services/Accommodation/BuildingTypeService.cs
@@ -1,6 +1,6 @@
 using UndacApp.Models;
 
-namespace UndacApp.Services.Accommodation
+namespace UndacApp.Services
 {
     public class BuildingTypeService : AService<BuildingType>, IBuildingTypeService
     {
diff --git a/Services/Accommodation/IBuildingTypeService.cs b/Services/Accommodation/IBuildingTypeService.cs
index 6e0d3f6..1c6a866 100644
--- a/Services/Accommodation/IBuildingTypeService.cs
+++ b/Services/Accommodation/IBuildingTypeService.cs
@@ -1,6 +1,6 @@
 using UndacApp.Models;
 
-namespace UndacApp.Services.Accommodation
+namespace UndacApp.Services
 {
     /// <summary>
     /// A service for handling building types.
diff --git a/Services/Accommodation/IRoomTypeService.cs b/Services/Accommodation/IRoomTypeService.cs
index b0a49bf..a4cf627 100644
--- a/Services/Accommodation/IRoomTypeService.cs
+++ b/Services/Accommodation/IRoomTypeService.cs
@@ -1,6 +1,6 @@
 using UndacApp.Models;
 
-namespace UndacApp.Services.Accommodation
+namespace UndacApp.Services
 {
     /// <summary>
     /// Interface used for managing rooms 
diff --git a/Services/Accommodation/RoomTypeService.cs b/Services/Accommodation/RoomTypeService.cs
index 6d330f7..8794eb1 100644
--- a/Services/Accommodation/RoomTypeService.cs
+++ b/Services/Accommodation/RoomTypeService.cs
@@ -1,6 +1,6 @@
 using UndacApp.Models;
 
-namespace UndacApp.Services.Accommodation
+namespace UndacApp.Services
 {
     /// <summary>
     /// service class for managing room types in a SQLite database
diff --git a/Services/EquipmentService.cs b/Services/EquipmentService.cs
index 20968b8..e78306e 100644
--- a/Services/EquipmentService.cs
+++ b/Services/EquipmentService.cs
@@ -5,7 +5,7 @@ namespace UndacApp.Services
     /*! <summary>
        EquipmentService extending IEQuipmentService Interface
    </summary> */
-    public class EquipmentService : AService<Equipment>, IEquipmentService
+    public class EquipmentService : AService<AnEquipment>, IEquipmentService
     {
         
     }
diff --git a/Services/IEquipmentService.cs b/Services/IEquipmentService.cs
index 036da07..39e01e9 100644
--- a/Services/IEquipmentService.cs
+++ b/Services/IEquipmentService.cs
@@ -5,7 +5,7 @@ namespace UndacApp.Services
     /*! <summary>
        Interface that exposes methods of EquipmentService
    </summary> */
-    public interface IEquipmentService : IService<Equipment>
+    public interface IEquipmentService : IService<AnEquipment>
     {
         
     }
diff --git a/UndacApp.csproj b/UndacApp.csproj
index 45d8fd8..ad76a81 100644
--- a/UndacApp.csproj
+++ b/UndacApp.csproj
@@ -65,6 +65,9 @@
 	  <MauiXaml Update="Views\AcceptSpecialistRequests.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\EquipmentPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\DisasterManagementCoordination.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -141,6 +144,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Views\EquipmentPage.xaml.cs">
+	    <DependentUpon>EquipmentPage.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\LogisticOperationPage.xaml.cs">
 	    <DependentUpon>LogisticOperationPage.xaml</DependentUpon>
 	  </Compile>
@@ -189,8 +195,8 @@
 	  <Compile Update="Views\RotaPage.xaml.cs">
 	    <DependentUpon>RotaPage.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="Views\EquipmentPage.xaml.cs">
-	    <DependentUpon>EquipmentPage.xaml</DependentUpon>
+	  <Compile Update="Views\EquipmentPage_Old.xaml.cs">
+	    <DependentUpon>EquipmentPage_Old.xaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="Views\WelcomePage.xaml.cs">
 	    <DependentUpon>%(Filename)</DependentUpon>
diff --git a/Views/AddResourcePage.xaml.cs b/Views/AddResourcePage.xaml.cs
index 7124672..f6f5a0e 100644
--- a/Views/AddResourcePage.xaml.cs
+++ b/Views/AddResourcePage.xaml.cs
@@ -1,7 +1,6 @@
 using System.Collections.ObjectModel;
 using UndacApp.Models;
 using UndacApp.Services;
-using UndacApp.Services.Accommodation;
 
 namespace UndacApp.Views;
 public partial class AddResourcePage : ContentPage
diff --git a/Views/BuildingTypePage.xaml.cs b/Views/BuildingTypePage.xaml.cs
index 4737f52..0a2aa58 100644
--- a/Views/BuildingTypePage.xaml.cs
+++ b/Views/BuildingTypePage.xaml.cs
@@ -1,7 +1,7 @@
 
 using UndacApp.Models;
 using System.Collections.ObjectModel;
-using UndacApp.Services.Accommodation;
+using UndacApp.Services;
 
 namespace UndacApp.Views;
 
diff --git a/Views/EquipmentPage.xaml b/Views/EquipmentPage.xaml
index e73ce38..bcfc092 100644
--- a/Views/EquipmentPage.xaml
+++ b/Views/EquipmentPage.xaml
@@ -1,29 +1,86 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sys="clr-namespace:System;assembly=netstandard"
              x:Class="UndacApp.Views.EquipmentPage"
-             Title="EquipmentPage"
-             xmlns:local="clr-namespace:Undac.Models">
-    <VerticalStackLayout Spacing="10" Margin="5">
-        <Editor x:Name="txe_equipment"
-                Placeholder="Add "
-                HeightRequest="100" />
+             Title="AddEquipments">
 
-        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
-            <Button Text="Save"
-                    Clicked="SaveButton_Clicked" />
+    <ScrollView>
+        <VerticalStackLayout Spacing="30" Padding="30,20" VerticalOptions="Center">
+            <!-- Title -->
 
-            <Button Grid.Column="1"
-                    Text="Delete"
-                    Clicked="DeleteButton_Clicked" />
-        </Grid>
+            <Label Text="Add Equipments" FontSize="26" FontAttributes="Bold" HorizontalOptions="CenterAndExpand"/>
 
-        <ListView x:Name="ltv_equipment" Background="white" ItemSelected="ltv_equipment_ItemSelected">
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <TextCell TextColor="Black" Text="{Binding Name}"/>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </VerticalStackLayout>
+            <Frame CornerRadius="10" Padding="20">
+                <VerticalStackLayout Spacing="5">
+                    <Label Text="Select equipment type:" FontSize="20" FontAttributes="Bold"/>
+                    <Picker x:Name="EquipmentTypePicker" BackgroundColor="White" TextColor="Black" TitleColor="Black">
+                        <Picker.ItemsSource>
+                            <x:Array Type="{x:Type x:String}">
+                                <x:String>Vehicles</x:String>
+                                <x:String>Communication</x:String>
+                                <x:String>Shelter and Bedding</x:String>
+                                <x:String>Power Generation</x:String>
+                            </x:Array>
+                        </Picker.ItemsSource>
+                    </Picker>
+                    <Label Text="Select Location:" FontSize="20" FontAttributes="Bold"/>
+                    <Picker x:Name="BuildingTypePicker" ItemDisplayBinding="{Binding Name}" BackgroundColor="White" TextColor="Black" TitleColor="Black"/>
+
+                    <Label Text="Equipment Name and Quantity:" FontSize="20" FontAttributes="Bold"/>
+                    <Entry Placeholder="Equipment Name:" x:Name="EquipmentName" />
+                    <Entry Placeholder="Quantity" x:Name="NumberRequiredEntry" Keyboard="Numeric"/>
+
+                    <Label Text="Assign Operation" FontSize="20" FontAttributes="Bold"/>
+                    <Picker x:Name="OperationListPicker" ItemDisplayBinding="{Binding Name}" BackgroundColor="White" TextColor="Black" TitleColor="Black"/>
+
+                    <Grid ColumnDefinitions="*,*,*" ColumnSpacing="3">
+                        <Button Text="Add Record" Grid.Column="0" Clicked="OnAddRecordClicked" BackgroundColor="#4CAF50" CornerRadius="8" />
+                        <Button Text="Update Record" Grid.Column="1" Clicked="OnUpdateClicked" BackgroundColor="blue" CornerRadius="8" />
+                        <Button Text="Remove Record" Grid.Column="2" Clicked="OnRemoveClicked" BackgroundColor="MediumVioletRed" CornerRadius="8" />
+                    </Grid>
+                </VerticalStackLayout>
+     
+            </Frame>
+            <Label Text="Equipment List" FontSize="26" FontAttributes="Bold" HorizontalOptions="CenterAndExpand"/>
+
+            <StackLayout Orientation="Horizontal">
+                <Entry x:Name="searchEntry" Placeholder="Search" HorizontalOptions="FillAndExpand" TextChanged="OnEntryTextChanged" />
+                <Picker x:Name="filterPicker" TextColor="White">
+                    <Picker.Title>Filter Equipment Status</Picker.Title>
+                    <Picker.ItemsSource>
+                        <x:Array Type="{x:Type x:String}">
+                            <x:String>Name</x:String>
+                            <x:String>Type</x:String>
+                            <x:String>Location</x:String>
+                        </x:Array>
+                    </Picker.ItemsSource>
+                    <Picker.SelectedItem>Name</Picker.SelectedItem>
+                </Picker>
+            </StackLayout>
+            <Button Text="Filter" Clicked="Button_Clicked" CornerRadius="8" />
+            <ListView x:Name="ltv_equipments" Background="white" ItemSelected="ltv_equipments_ItemSelected">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <Grid Padding="10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Label Grid.Row="0" Text="{Binding CurrentOperation}" TextColor="Black" FontAttributes="Bold"/>
+                                <Label Grid.Row="1" Text="{Binding Type}" TextColor="Black"/>
+                                <Label Grid.Row="2" Text="{Binding Name}" TextColor="Black"/>
+                                <Label Grid.Row="3" Text="{Binding Location}" TextColor="Black"/>
+                                <Label Grid.Row="4" Text="{Binding Quantity}" TextColor="Black"/>
+                            </Grid>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </VerticalStackLayout>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Views/EquipmentPage.xaml.cs b/Views/EquipmentPage.xaml.cs
index a404987..cf79d79 100644
--- a/Views/EquipmentPage.xaml.cs
+++ b/Views/EquipmentPage.xaml.cs
@@ -1,106 +1,203 @@
-
+using CommunityToolkit.Mvvm.DependencyInjection;
+using System.Collections.ObjectModel;
 using UndacApp.Models;
 using UndacApp.Services;
-using System.Collections.ObjectModel;
 
 namespace UndacApp.Views;
-/*! <summary>
-        EquipmentPage class extending ContentPage, responsible for functionality on EquipmentPage view.
-    </summary> */
 public partial class EquipmentPage : ContentPage
 {
-    /*! <summary>
-        A reference pointer for storing currently selected Equipment.
-     </summary> */
-    Equipment selectedEquipment = null;
-    /*! <summary>
-        An instance of IEquipmentService
-     </summary> */
-    IEquipmentService equipmentService;
-    /*! <summary>
-        Collection of current Equipments.
-    </summary> */
-    ObservableCollection<Equipment> equipments = new ObservableCollection<Equipment>();
-    /*! <summary>
-        Constructor class, setting the binding context and initiating the equipment service, as well as loading the equipment list.
-    </summary> */
+	private ILogisticsService logisticsService;
+    private IBuildingTypeService buildingTypeService;
+	private IEquipmentService equipmentService;
+
+
+    private ObservableCollection<AnEquipment> EquipmentList { get; set; } = new ObservableCollection<AnEquipment>();
+    private ObservableCollection<BuildingType> BuildingList { get; set; } = new ObservableCollection<BuildingType>();
+    private ObservableCollection<LogisticsOperation> OperationList { get; set; } = new ObservableCollection<LogisticsOperation>();
+
+    private AnEquipment? selectedEquipment = null;
+
     public EquipmentPage()
-    {
-        InitializeComponent();
-        BindingContext =new Equipment();
+	{
+		InitializeComponent();
+		BindingContext = this;
+
         this.equipmentService = new EquipmentService();
+        this.buildingTypeService = new BuildingTypeService();
+		this.logisticsService = new LogisticsService();
+    }
+
+	protected async override void OnAppearing()
+	{
+		ClearInput();
 
-        Task.Run(async () => await LoadEquipment());
-        txe_equipment.Text = "";
+        base.OnAppearing();
+		await PopulateEquipmentTypes();
+	}
+
+	private void ClearInput()
+	{
+        EquipmentName.Text = String.Empty;
+        NumberRequiredEntry.Text = String.Empty;
+        EquipmentTypePicker.SelectedIndex = 0;
     }
-    /*! <summary>
-        Private method loading the Equipment list using equipmentService getter.
-    </summary> 
-    <returns>Task promise, informing about the status of its' completion.</returns> */
-    private async Task LoadEquipment()
-    {
-        equipments = new ObservableCollection<Equipment>(await equipmentService.GetAll());
-        ltv_equipment.ItemsSource = equipments;
+
+	private void OnAddRecordClicked(object sender, EventArgs e)
+	{
+		AddNewEquipmentTypeRequest();
+	}
+
+	private void OnUpdateClicked(object sender, EventArgs e)
+	{
+		try
+		{
+            AnEquipment eq = GetCurrentEquipment();
+            if (selectedEquipment is null || eq is null) return;
+
+            selectedEquipment.Name = eq.Name;
+            selectedEquipment.Type = eq.Type; ;
+            selectedEquipment.Location = eq.Location;
+            selectedEquipment.CurrentOperation = eq.CurrentOperation;
+            selectedEquipment.Quantity = eq.Quantity;
+            equipmentService.Update(selectedEquipment);
+        }
+        catch (Exception ex)
+        {
+            DisplayAlert("Error", $"Failed to update record. Error: {ex.Message}", "OK");
+            return;
+        }
     }
-    /*! <summary>
-         Method responsible for saving equipment into SQLite database, triggered by selection of save button.
-     </summary> 
-     <param name="sender">Details about the element that triggered the event.</param>
-     <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
-    private void SaveButton_Clicked(object sender, EventArgs e)
-    {
-        if (String.IsNullOrEmpty(txe_equipment.Text)) return;
 
-        if (selectedEquipment == null)
+    private void OnRemoveClicked(object sender, EventArgs e)
+    {
+        try
         {
-            var role = new Equipment() { Name = txe_equipment.Text };
-            equipmentService.Add(role);
-            equipments.Add(role);
+            if (selectedEquipment is null) return;
+            equipmentService.Remove(selectedEquipment);
+			EquipmentList.Remove(selectedEquipment);
         }
-        else
+        catch (Exception ex)
         {
-            selectedEquipment.Name = txe_equipment.Text;
-            equipmentService.Update(selectedEquipment);
-            var equipment = equipments.FirstOrDefault(x => x.ID == selectedEquipment.ID);
-            equipment.Name = txe_equipment.Text;
+            DisplayAlert("Error", $"Failed to remove record. Error: {ex.Message}", "OK");
+            return;
         }
 
+    }
 
-        selectedEquipment = null;
-        ltv_equipment.SelectedItem = null;
-        txe_equipment.Text = "";
+    private AnEquipment GetCurrentEquipment()
+    {
+        String? type = EquipmentTypePicker.SelectedItem as String;
+        BuildingType? loc = BuildingTypePicker.SelectedItem as BuildingType;
+        LogisticsOperation? op = OperationListPicker.SelectedItem as LogisticsOperation;
+
+        if (String.IsNullOrEmpty(type)
+            || String.IsNullOrEmpty(op.Name)
+            || String.IsNullOrEmpty(loc.Name)
+            || String.IsNullOrEmpty(EquipmentName.Text)
+            || String.IsNullOrEmpty(NumberRequiredEntry.Text)) return null;
+
+        AnEquipment eq = new AnEquipment();
+
+        eq.Name = EquipmentName.Text;
+        eq.Type = type;
+        eq.Location = loc.Name;
+        eq.CurrentOperation = op.Name;
+        eq.Quantity = Int32.Parse(NumberRequiredEntry.Text);
+
+        return eq;
     }
-    /*! <summary>
-         Method responsible for removing organisation from SQLite database, triggered by selection of delete button.
-         Note: If no Organisation is selected, no organisation will be removed.
-    </summary> 
-    <param name="sender">Details about the element that triggered the event.</param>
-    <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
-    private async void DeleteButton_Clicked(object sender, EventArgs e)
+
+    private void AddNewEquipmentTypeRequest()
+	{
+		try
+		{
+            AnEquipment eq = GetCurrentEquipment();
+            if (eq == null) return;
+
+            equipmentService.Add(eq);
+			EquipmentList.Add(eq);
+            DisplayAlert("Success", $"Successfully inserted record.", "OK");
+		}
+		catch (Exception ex)
+		{
+			DisplayAlert("Error", $"Failed to insert record. Error: {ex.Message}", "OK");
+			return;
+		}
+	}
+
+	private async Task PopulateEquipmentTypes()
+	{
+		try
+		{
+			OperationList = new ObservableCollection<LogisticsOperation>(await logisticsService.GetAll());
+
+			LogisticsOperation defaultOperation = new LogisticsOperation();
+			defaultOperation.Name = "No Logistic Mission Assigned";
+
+			OperationList.Insert(0, defaultOperation);
+            OperationListPicker.ItemsSource = OperationList;
+            OperationListPicker.SelectedIndex = 0;
+
+
+			BuildingList = new ObservableCollection<BuildingType>(await buildingTypeService.GetAll());
+			BuildingTypePicker.ItemsSource = BuildingList;
+            if (BuildingList.Count > 0) BuildingTypePicker.SelectedIndex = 0;
+
+            EquipmentList = new ObservableCollection<AnEquipment>(await equipmentService.GetAll());
+            ltv_equipments.ItemsSource = EquipmentList;
+        }
+		catch (Exception ex)
+		{
+			await DisplayAlert("Error", $"Failed to load EquipmentTypeRequests. Error: {ex.Message}", "OK");
+			return;
+		}
+	}
+
+	private void ltv_equipments_ItemSelected(object sender, EventArgs e)
+	{
+        selectedEquipment = ltv_equipments.SelectedItem as AnEquipment;
+		if (selectedEquipment is null) return;
+
+		EquipmentName.Text = selectedEquipment.Name;
+		NumberRequiredEntry.Text = selectedEquipment.Quantity.ToString();
+
+        EquipmentTypePicker.SelectedIndex = EquipmentTypePicker.Items.IndexOf(selectedEquipment.Type);
+		BuildingTypePicker.SelectedIndex = BuildingTypePicker.Items.IndexOf(selectedEquipment.Location);
+        OperationListPicker.SelectedIndex = OperationListPicker.Items.IndexOf(selectedEquipment.CurrentOperation);
+    }
+
+    private void UpdateFilter()
     {
-        if (ltv_equipment.SelectedItem == null)
+		string? filterType = filterPicker.SelectedItem.ToString();
+        string? selectedFilter = searchEntry.Text;
+        if (EquipmentList.Count < 1 || String.IsNullOrEmpty(searchEntry.Text) 
+			|| String.IsNullOrEmpty(filterType))
         {
-            await Shell.Current.DisplayAlert("No Equipment Selected", "Select the role you want to delete from the list", "OK");
+            ltv_equipments.ItemsSource = EquipmentList;
             return;
         }
 
-        await equipmentService.Remove(selectedEquipment);
-        equipments.Remove(selectedEquipment);
-
-        ltv_equipment.SelectedItem = null;
-        txe_equipment.Text = "";
+		if (filterType.Equals("Type"))
+        {
+            ltv_equipments.ItemsSource = EquipmentList.Where(r => r.Type.ToLower().Contains(selectedFilter.ToLower()));
+        }
+		else if (filterType.Equals("Location"))
+		{
+            ltv_equipments.ItemsSource = EquipmentList.Where(r => r.Location.ToLower().Contains(selectedFilter.ToLower()));
+        }
+		else
+		{
+            ltv_equipments.ItemsSource = EquipmentList.Where(r => r.Name.ToLower().Contains(selectedFilter.ToLower()));
+        }
     }
 
-    /*! <summary>
-            Method responsible for updating currently selected item, integrating UI and Backend functionality.
-        </summary> 
-        <param name="sender">Details about the element that triggered the event.</param>
-        <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
-    private void ltv_equipment_ItemSelected(object sender, SelectedItemChangedEventArgs e)
-    {
-        selectedEquipment = e.SelectedItem as Equipment;
-        if (selectedEquipment == null) return;
+	void OnEntryTextChanged(object sender, TextChangedEventArgs e)
+	{
+		UpdateFilter();
+	}
 
-        txe_equipment.Text = selectedEquipment.Name;
+   private void Button_Clicked(object sender, EventArgs e)
+    {
+        UpdateFilter();
     }
-}
\ No newline at end of file
+}
diff --git a/Views/EquipmentPage_Old.xaml b/Views/EquipmentPage_Old.xaml
new file mode 100644
index 0000000..cdd5590
--- /dev/null
+++ b/Views/EquipmentPage_Old.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="UndacApp.Views.EquipmentPage_Old"
+             Title="EquipmentPage"
+             xmlns:local="clr-namespace:Undac.Models">
+    <VerticalStackLayout Spacing="10" Margin="5">
+        <Editor x:Name="txe_equipment"
+                Placeholder="Add "
+                HeightRequest="100" />
+
+        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
+            <Button Text="Save"
+                    Clicked="SaveButton_Clicked" />
+
+            <Button Grid.Column="1"
+                    Text="Delete"
+                    Clicked="DeleteButton_Clicked" />
+        </Grid>
+
+        <ListView x:Name="ltv_equipment" Background="white" ItemSelected="ltv_equipment_ItemSelected">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <TextCell TextColor="Black" Text="{Binding Name}"/>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Views/EquipmentPage_Old.xaml.cs b/Views/EquipmentPage_Old.xaml.cs
new file mode 100644
index 0000000..59e4c28
--- /dev/null
+++ b/Views/EquipmentPage_Old.xaml.cs
@@ -0,0 +1,106 @@
+
+using UndacApp.Models;
+using UndacApp.Services;
+using System.Collections.ObjectModel;
+
+namespace UndacApp.Views;
+/*! <summary>
+        EquipmentPage class extending ContentPage, responsible for functionality on EquipmentPage view.
+    </summary> */
+public partial class EquipmentPage_Old : ContentPage
+{
+    /*! <summary>
+        A reference pointer for storing currently selected Equipment.
+     </summary> */
+    AnEquipment selectedEquipment = null;
+    /*! <summary>
+        An instance of IEquipmentService
+     </summary> */
+    IEquipmentService equipmentService;
+    /*! <summary>
+        Collection of current Equipments.
+    </summary> */
+    ObservableCollection<AnEquipment> equipments = new ObservableCollection<AnEquipment>();
+    /*! <summary>
+        Constructor class, setting the binding context and initiating the equipment service, as well as loading the equipment list.
+    </summary> */
+    public EquipmentPage_Old()
+    {
+        InitializeComponent();
+        BindingContext =new AnEquipment();
+        this.equipmentService = new EquipmentService();
+
+        Task.Run(async () => await LoadEquipment());
+        txe_equipment.Text = "";
+    }
+    /*! <summary>
+        Private method loading the Equipment list using equipmentService getter.
+    </summary> 
+    <returns>Task promise, informing about the status of its' completion.</returns> */
+    private async Task LoadEquipment()
+    {
+        equipments = new ObservableCollection<AnEquipment>(await equipmentService.GetAll());
+        ltv_equipment.ItemsSource = equipments;
+    }
+    /*! <summary>
+         Method responsible for saving equipment into SQLite database, triggered by selection of save button.
+     </summary> 
+     <param name="sender">Details about the element that triggered the event.</param>
+     <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
+    private void SaveButton_Clicked(object sender, EventArgs e)
+    {
+        if (String.IsNullOrEmpty(txe_equipment.Text)) return;
+
+        if (selectedEquipment == null)
+        {
+            var role = new AnEquipment() { Name = txe_equipment.Text };
+            equipmentService.Add(role);
+            equipments.Add(role);
+        }
+        else
+        {
+            selectedEquipment.Name = txe_equipment.Text;
+            equipmentService.Update(selectedEquipment);
+            var equipment = equipments.FirstOrDefault(x => x.ID == selectedEquipment.ID);
+            equipment.Name = txe_equipment.Text;
+        }
+
+
+        selectedEquipment = null;
+        ltv_equipment.SelectedItem = null;
+        txe_equipment.Text = "";
+    }
+    /*! <summary>
+         Method responsible for removing organisation from SQLite database, triggered by selection of delete button.
+         Note: If no Organisation is selected, no organisation will be removed.
+    </summary> 
+    <param name="sender">Details about the element that triggered the event.</param>
+    <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
+    private async void DeleteButton_Clicked(object sender, EventArgs e)
+    {
+        if (ltv_equipment.SelectedItem == null)
+        {
+            await Shell.Current.DisplayAlert("No Equipment Selected", "Select the role you want to delete from the list", "OK");
+            return;
+        }
+
+        await equipmentService.Remove(selectedEquipment);
+        equipments.Remove(selectedEquipment);
+
+        ltv_equipment.SelectedItem = null;
+        txe_equipment.Text = "";
+    }
+
+    /*! <summary>
+            Method responsible for updating currently selected item, integrating UI and Backend functionality.
+        </summary> 
+        <param name="sender">Details about the element that triggered the event.</param>
+        <param name="e">Event details, passed by eventHandler due to clicking event button.</param> */
+    private void ltv_equipment_ItemSelected(object sender, SelectedItemChangedEventArgs e)
+    {
+        selectedEquipment = e.SelectedItem as AnEquipment;
+        if (selectedEquipment == null) return;
+
+        txe_equipment.Text = selectedEquipment.Name;
+    }
+}
\ No newline at end of file
diff --git a/Views/RoomTypePage.xaml.cs b/Views/RoomTypePage.xaml.cs
index 8086f26..dff768f 100644
--- a/Views/RoomTypePage.xaml.cs
+++ b/Views/RoomTypePage.xaml.cs
@@ -1,7 +1,6 @@
 using UndacApp.Models;
 using UndacApp.Services;
 using System.Collections.ObjectModel;
-using UndacApp.Services.Accommodation;
 
 namespace UndacApp.Views;