diff --git a/Docs/maui_banner.png b/Docs/maui_banner.png
new file mode 100644
index 0000000..254b186
--- /dev/null
+++ b/Docs/maui_banner.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dedd77ff0f18f26d7b1e4cfd548b7a60661332b0c6c2251811a283640b9731bf
+size 651292
diff --git a/Maui/MauiSample/MauiProgram.cs b/Maui/MauiSample/MauiProgram.cs
index 83e6fb4..08f7427 100644
--- a/Maui/MauiSample/MauiProgram.cs
+++ b/Maui/MauiSample/MauiProgram.cs
@@ -5,7 +5,6 @@
 
 using Sharpnado.CollectionView;
 using Sharpnado.Tabs;
-using SkiaSharp.Views.Maui.Controls.Hosting;
 
 namespace MauiSample;
 
@@ -16,9 +15,8 @@ public static MauiApp CreateMauiApp()
 		var builder = MauiApp.CreateBuilder();
 		builder
 			.UseMauiApp<App>()
-			.UseSkiaSharp()
 			.UseSharpnadoTabs(loggerEnable: false)
-			.UseSharpnadoCollectionView(loggerEnable: false)
+			.UseSharpnadoCollectionView(loggerEnable: true, debugLogEnable: false)
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
diff --git a/Maui/MauiSample/MauiSample.csproj b/Maui/MauiSample/MauiSample.csproj
index 09f09e6..7b4e117 100644
--- a/Maui/MauiSample/MauiSample.csproj
+++ b/Maui/MauiSample/MauiSample.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net6.0-ios;net6.0-android</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -12,7 +11,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 
 		<!-- Display name -->
-		<ApplicationTitle>MauiSample</ApplicationTitle>
+		<ApplicationTitle>MauiCollectionView</ApplicationTitle>
 
 		<!-- App Identifier -->
 		<ApplicationId>com.sharpnado.collectionview</ApplicationId>
@@ -30,12 +29,21 @@
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
+	  <MtouchLink>None</MtouchLink>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+	  <CodesignKey>Apple Development: Created via API (K8Q3S2AN24)</CodesignKey>
+	  <CodesignProvision>VS: WildCard Development</CodesignProvision>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\logo.png" Color="#d81b60" BaseSize="256,128" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+		<MauiSplashScreen Include="Resources\Splash\logo.png" Color="#d81b60" BaseSize="256,128" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
@@ -55,23 +63,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <PackageReference Include="AlohaKit" Version="1.0.74" />
 	  <PackageReference Include="Sharpnado.Maui.TaskLoaderView" Version="2.5.1" />
 	  <PackageReference Include="Sharpnado.Tabs.Maui" Version="3.0.0" />
 	  <PackageReference Include="SimpleInjector" Version="5.4.1" />
-	  <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.3" />
-	  <PackageReference Include="SkiaSharp.Views.Maui.Core" Version="2.88.3" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <MauiXaml Update="Resources\Styles\Shadows.xaml">
-	    <SubType>Designer</SubType>
-	  </MauiXaml>
-	  <MauiXaml Update="Resources\Styles\Text.xaml">
-	    <SubType>Designer</SubType>
-	  </MauiXaml>
-	  <MauiXaml Update="Resources\Styles\Border.xaml">
-	    <SubType>Designer</SubType>
-	  </MauiXaml>
-	</ItemGroup>
+	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionMauiSampleHideInfoBar="True" /></VisualStudio></ProjectExtensions>
 
 </Project>
diff --git a/Maui/MauiSample/MauiSample.sln b/Maui/MauiSample/MauiSample.sln
index 4c73441..4ce997f 100644
--- a/Maui/MauiSample/MauiSample.sln
+++ b/Maui/MauiSample/MauiSample.sln
@@ -5,7 +5,14 @@ VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiSample", "MauiSample.csproj", "{ADABD103-2CEE-40B2-9EC4-BDA08DB009D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpnado.CollectionView.Maui", "..\Sharpnado.CollectionView.Maui\Sharpnado.CollectionView.Maui.csproj", "{6CBC693C-5270-448E-BE40-3E03B713BBC7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sharpnado.CollectionView.Maui", "..\Sharpnado.CollectionView.Maui\Sharpnado.CollectionView.Maui.csproj", "{6CBC693C-5270-448E-BE40-3E03B713BBC7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "configuration", "configuration", "{E6CDC5C8-6D84-4EFF-BB42-1F92ED8D06DE}"
+	ProjectSection(SolutionItems) = preProject
+		..\..\README.md = ..\..\README.md
+		..\..\Settings.XamlStyler = ..\..\Settings.XamlStyler
+		..\..\StyleCopRules.ruleset = ..\..\StyleCopRules.ruleset
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Maui/MauiSample/Presentation/Views/ChoosePage.xaml b/Maui/MauiSample/Presentation/Views/ChoosePage.xaml
index 51ac869..22c5ec2 100644
--- a/Maui/MauiSample/Presentation/Views/ChoosePage.xaml
+++ b/Maui/MauiSample/Presentation/Views/ChoosePage.xaml
@@ -6,22 +6,28 @@
     xmlns:converters="clr-namespace:MauiSample.Presentation.Converters"
     xmlns:sho="http://sharpnado.com"
     xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
+    Padding="0"
     x:DataType="viewModels:ChoosePageViewModel"
     BackgroundColor="{StaticResource DarkerSurface}"
     NavigationPage.HasNavigationBar="False">
-    <StackLayout>
+    <VerticalStackLayout>
+        <VerticalStackLayout.Margin>
+            <OnPlatform x:TypeArguments="Thickness">
+                <On Platform="iOS">0, -45, 0, -35</On>
+                <On Platform="Android">0</On>
+            </OnPlatform>
+        </VerticalStackLayout.Margin>
 
-        <StackLayout
+        <VerticalStackLayout
             BackgroundColor="{StaticResource DarkSurface}"
-            Orientation="Vertical"
             Shadow="{StaticResource DarkBottomShadow}"
             Spacing="0">
-            <StackLayout.Padding>
+            <VerticalStackLayout.Padding>
                 <OnPlatform x:TypeArguments="Thickness">
                     <On Platform="iOS">20, 60, 20, 20</On>
                     <On Platform="Android">20, 40, 20, 20</On>
                 </OnPlatform>
-            </StackLayout.Padding>
+            </VerticalStackLayout.Padding>
 
             <Grid ColumnDefinitions="*, 60" RowDefinitions="Auto,Auto">
                 <Label
@@ -49,18 +55,18 @@
                     Text="MAUI"
                     TextColor="{StaticResource Accent}" />
             </Grid>
-        </StackLayout>
+        </VerticalStackLayout>
 
         <!--  HorizontalListView Logo  -->
         <sho:GridView
             x:Name="HorizontalListView"
-            CollectionPadding="30,30,30,0"
+            CollectionPadding="30"
             ColumnCount="3"
             EnableDragAndDrop="True"
-            HeightRequest="360"
+            HeightRequest="390"
+            HorizontalOptions="Fill"
             ItemHeight="110"
             ItemsSource="{Binding Logo, Mode=OneTime}"
-            VerticalOptions="Fill"
             ZIndex="100">
             <sho:GridView.ItemTemplate>
                 <DataTemplate x:DataType="viewModels:LogoLetterVmo">
@@ -126,7 +132,7 @@
         </sho:GridView>
 
         <StackLayout
-            Margin="0,30"
+            Margin="0,15"
             Spacing="20"
             ZIndex="10">
             <Button
@@ -153,5 +159,5 @@
 
         </StackLayout>
 
-    </StackLayout>
+    </VerticalStackLayout>
 </ContentPage>
diff --git a/Maui/MauiSample/Presentation/Views/ChoosePage.xaml.cs b/Maui/MauiSample/Presentation/Views/ChoosePage.xaml.cs
index d00cf00..4d7c1db 100644
--- a/Maui/MauiSample/Presentation/Views/ChoosePage.xaml.cs
+++ b/Maui/MauiSample/Presentation/Views/ChoosePage.xaml.cs
@@ -1,6 +1,10 @@
-using MauiSample.Presentation.Navigables;
+using System.Collections.ObjectModel;
+
+using MauiSample.Presentation.Navigables;
 using MauiSample.Presentation.Navigables.Impl;
 using MauiSample.Presentation.ViewModels;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 
 namespace MauiSample.Presentation.Views
 {
@@ -14,6 +18,13 @@ public ChoosePage(FormsNavigationService navigationService)
             _navigationService = navigationService;
 
             InitializeComponent();
+            On<iOS>().SetUseSafeArea(false);
+        }
+
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+            Padding = new Thickness(0);
         }
 
         private async void LayoutButton_OnClicked(object sender, EventArgs e)
diff --git a/Maui/MauiSample/Presentation/Views/GridPage.xaml b/Maui/MauiSample/Presentation/Views/GridPage.xaml
index 8ba8635..613d671 100644
--- a/Maui/MauiSample/Presentation/Views/GridPage.xaml
+++ b/Maui/MauiSample/Presentation/Views/GridPage.xaml
@@ -9,6 +9,7 @@
     xmlns:taskLoaderView="clr-namespace:Sharpnado.TaskLoaderView;assembly=Sharpnado.Maui.TaskLoaderView"
     xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
     xmlns:views="clr-namespace:MauiSample.Presentation.Views"
+    Padding="0"
     x:DataType="viewModels:GridPageViewModel"
     BackgroundColor="{StaticResource DarkerSurface}"
     NavigationPage.HasNavigationBar="False">
@@ -35,7 +36,7 @@
                                     Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
                                     TargetType="views:SillyGridCell"
                                     Value="True">
-                                    <Setter Property="Background" Value="{StaticResource DarklessSurface}" />
+                                    <Setter Property="Background" Value="{StaticResource DarkDraggedSurface}" />
                                 </DataTrigger>
                             </views:SillyGridCell.Triggers>
                         </views:SillyGridCell>
@@ -55,7 +56,7 @@
                                     Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
                                     TargetType="views:SillyHorizontalCell"
                                     Value="True">
-                                    <Setter Property="Background" Value="{StaticResource DarklessSurface}" />
+                                    <Setter Property="Background" Value="{StaticResource DarkDraggedSurface}" />
                                 </DataTrigger>
                             </views:SillyHorizontalCell.Triggers>
                         </views:SillyHorizontalCell>
@@ -75,7 +76,7 @@
                                     Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
                                     TargetType="views:SillyListCell"
                                     Value="True">
-                                    <Setter Property="Background" Value="{StaticResource DarklessSurface}" />
+                                    <Setter Property="Background" Value="{StaticResource DarkDraggedSurface}" />
                                 </DataTrigger>
                             </views:SillyListCell.Triggers>
                         </views:SillyListCell>
@@ -94,13 +95,19 @@
 
     <ContentPage.Content>
         <Grid RowDefinitions="Auto,*">
+            <Grid.Margin>
+                <OnPlatform x:TypeArguments="Thickness">
+                    <On Platform="iOS">0, -45, 0, -35</On>
+                    <On Platform="Android">0</On>
+                </OnPlatform>
+            </Grid.Margin>
 
             <taskLoaderView:TaskLoaderView
                 Grid.Row="1"
                 IsClippedToBounds="False"
                 Style="{StaticResource SillyTaskLoader}"
                 TaskLoaderNotifier="{Binding SillyPeopleLoaderNotifier}"
-                VerticalOptions="FillAndExpand">
+                VerticalOptions="Fill">
                 <RefreshView
                     Command="{Binding SillyPeopleLoaderNotifier.RefreshCommand}"
                     IsClippedToBounds="False"
@@ -127,53 +134,6 @@
                         ScrollEndedCommand="{Binding OnScrollEndCommand}"
                         TapCommand="{Binding TapCommand}" />
 
-
-                    <!--  Testing the ViewCacheSize property  -->
-                    <!--<sho:CollectionView
-                        x:Name="HorizontalListView"
-                        CollectionLayout="{Binding Mode, Converter={converters:ListModeToListLayout}}"
-                        CollectionLayoutChanging="ListLayoutChanging"
-                        CollectionPadding="10,30,10,75"
-                        ColumnCount="2"
-                        CurrentIndex="{Binding CurrentIndex}"
-                        DragAndDropEndedCommand="{Binding OnDragEnded}"
-                        DragAndDropStartedCommand="{Binding OnDragStarted}"
-                        DragAndDropTrigger="Pan"
-                        EnableDragAndDrop="{Binding Source={x:Reference DragAndDropSwitch}, Path=IsToggled}"
-                        InfiniteListLoader="{Binding SillyPeoplePaginator}"
-                        ItemHeight="120"
-                        ItemWidth="120"
-                        ItemsSource="{Binding SillyPeople}"
-                        ScrollBeganCommand="{Binding OnScrollBeginCommand}"
-                        ScrollEndedCommand="{Binding OnScrollEndCommand}"
-                        TapCommand="{Binding TapCommand}"
-                        ViewCacheSize="100">
-                        <sho:CollectionView.ItemTemplate>
-                            <DataTemplate>
-                                <sho:DraggableViewCell x:Name="DraggableViewCell">
-                                    <sho:Shadows
-                                        x:Name="Shadow"
-                                        CornerRadius="10"
-                                        Shades="{StaticResource ThinDarkerNeumorphism}">
-                                        <views:SillyGridCell
-                                            Margin="16,13,16,13"
-                                            BackgroundColor="{StaticResource DarkerSurface}"
-                                            CornerRadius="10">
-                                            <views:SillyGridCell.Triggers>
-                                                <DataTrigger
-                                                    Binding="{Binding Source={x:Reference DraggableViewCell}, Path=IsDragAndDropping}"
-                                                    TargetType="views:SillyGridCell"
-                                                    Value="True">
-                                                    <Setter Property="BackgroundColor" Value="{StaticResource DarkSurface}" />
-                                                </DataTrigger>
-                                            </views:SillyGridCell.Triggers>
-                                        </views:SillyGridCell>
-                                    </sho:Shadows>
-                                </sho:DraggableViewCell>
-                            </DataTemplate>
-                        </sho:CollectionView.ItemTemplate>
-                    </sho:CollectionView>-->
-
                 </RefreshView>
             </taskLoaderView:TaskLoaderView>
 
@@ -188,7 +148,7 @@
                     </OnPlatform>
                 </VerticalStackLayout.Padding>
 
-                <Grid ColumnDefinitions="60,*, 60" RowDefinitions="30, 30, 50">
+                <Grid ColumnDefinitions="60,*, 60" RowDefinitions="30, 30, 15, 40">
                     <ImageButton
                         Grid.RowSpan="2"
                         BackgroundColor="{StaticResource DarkSurface}"
@@ -233,39 +193,47 @@
                     </Image>
 
                     <HorizontalStackLayout
-                        Grid.Row="2"
+                        Grid.Row="3"
                         Grid.Column="0"
                         Grid.ColumnSpan="3"
                         HeightRequest="40"
                         HorizontalOptions="End"
                         Spacing="10">
+
                         <HorizontalStackLayout
                             Margin="16,0,0,0"
                             Spacing="10"
-                            VerticalOptions="End">
+                            VerticalOptions="Fill">
                             <Label
                                 Margin="0,0,0,2"
                                 FontSize="12"
                                 Text="Drag and Drop"
                                 TextColor="White"
-                                VerticalOptions="Center" />
+                                VerticalOptions="Center"
+                                VerticalTextAlignment="Center" />
                             <Switch x:Name="DragAndDropSwitch" VerticalOptions="Center" />
                         </HorizontalStackLayout>
 
-                        <HorizontalStackLayout x:Name="ColumnCountContainer" VerticalOptions="End">
+                        <HorizontalStackLayout x:Name="ColumnCountContainer" VerticalOptions="Fill">
                             <Label
                                 Margin="0,0,0,2"
                                 FontSize="12"
                                 Text="Column Count"
                                 TextColor="White"
-                                VerticalOptions="Center" />
+                                VerticalOptions="Center"
+                                VerticalTextAlignment="Center" />
                             <Picker
                                 x:Name="ColumnPicker"
-                                Margin="10,0,0,0"
-                                BackgroundColor="{StaticResource DarkSurface}"
                                 FontAttributes="Bold"
-                                FontSize="15"
-                                TextColor="{StaticResource Primary}" />
+                                FontSize="18"
+                                TextColor="{StaticResource Primary}">
+                                <Picker.Margin>
+                                    <OnPlatform x:TypeArguments="Thickness">
+                                        <On Platform="iOS">10,-5,0,0</On>
+                                        <On Platform="Android">10,0,0,0</On>
+                                    </OnPlatform>
+                                </Picker.Margin>
+                            </Picker>
                         </HorizontalStackLayout>
                     </HorizontalStackLayout>
 
diff --git a/Maui/MauiSample/Presentation/Views/GridPage.xaml.cs b/Maui/MauiSample/Presentation/Views/GridPage.xaml.cs
index 959fdab..1278dd7 100644
--- a/Maui/MauiSample/Presentation/Views/GridPage.xaml.cs
+++ b/Maui/MauiSample/Presentation/Views/GridPage.xaml.cs
@@ -1,4 +1,7 @@
 using MauiSample.Presentation.Navigables;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+
 using Sharpnado.CollectionView;
 
 namespace MauiSample.Presentation.Views
@@ -12,6 +15,8 @@ public GridPage()
         {
             InitializeComponent();
 
+            On<iOS>().SetUseSafeArea(false);
+
             HorizontalListView.PreRevealAnimationAsync = async (viewCell) =>
                 {
                     viewCell.View.Opacity = 0;
diff --git a/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml b/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml
index 9f39045..5ec8a34 100644
--- a/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml
+++ b/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml
@@ -8,6 +8,7 @@
     xmlns:taskLoaderView="clr-namespace:Sharpnado.TaskLoaderView;assembly=Sharpnado.Maui.TaskLoaderView"
     xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
     xmlns:views="clr-namespace:MauiSample.Presentation.Views"
+    Padding="0"
     x:DataType="viewModels:HeaderFooterGroupingPageViewModel"
     BackgroundColor="{StaticResource DarkerSurface}"
     NavigationPage.HasNavigationBar="False">
@@ -108,11 +109,20 @@
 
     <ContentPage.Content>
         <Grid RowDefinitions="Auto,*">
+            <Grid.Margin>
+                <OnPlatform x:TypeArguments="Thickness">
+                    <On Platform="iOS">0, -45, 0, -35</On>
+                    <On Platform="Android">0</On>
+                </OnPlatform>
+            </Grid.Margin>
 
             <taskLoaderView:TaskLoaderView
+                x:Name="LoaderView"
                 Grid.Row="1"
+                IsClippedToBounds="False"
                 Style="{StaticResource SillyTaskLoader}"
-                TaskLoaderNotifier="{Binding SillyPeopleLoaderNotifier}">
+                TaskLoaderNotifier="{Binding SillyPeopleLoaderNotifier}"
+                VerticalOptions="Fill">
                 <RefreshView
                     Command="{Binding SillyPeopleLoaderNotifier.RefreshCommand}"
                     IsRefreshing="{Binding SillyPeopleLoaderNotifier.ShowRefresher}"
diff --git a/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml.cs b/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml.cs
index 10fcc7e..e8dcf7a 100644
--- a/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml.cs
+++ b/Maui/MauiSample/Presentation/Views/HeaderFooterGroupingPage.xaml.cs
@@ -1,4 +1,6 @@
 using MauiSample.Presentation.Navigables;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 
 namespace MauiSample.Presentation.Views
 {
@@ -8,6 +10,7 @@ public partial class HeaderFooterGroupingPage : ContentPage, IBindablePage
         public HeaderFooterGroupingPage()
         {
             InitializeComponent();
+            On<iOS>().SetUseSafeArea(false);
         }
     }
 }
\ No newline at end of file
diff --git a/Maui/MauiSample/Presentation/Views/RatingView.cs b/Maui/MauiSample/Presentation/Views/RatingView.cs
deleted file mode 100644
index 26031ca..0000000
--- a/Maui/MauiSample/Presentation/Views/RatingView.cs
+++ /dev/null
@@ -1,382 +0,0 @@
-// ****************************************************************************
-// Copyright (c) 2017 Clovis Nicolas
-// https://github.com/clovisnicolas/SkiaRate
-// ****************************************************************************
-// This file isn't generated, but this comment is necessary to exclude it from StyleCop analysis.
-// <auto-generated/>
-
-using SkiaSharp;
-using SkiaSharp.Views.Maui;
-using SkiaSharp.Views.Maui.Controls;
-
-using SKPaintSurfaceEventArgs = SkiaSharp.Views.Maui.SKPaintSurfaceEventArgs;
-
-namespace MauiSample.Presentation.Views
-{
-    public static class MaterialColors
-    {
-        public static SKColor Red => SKColor.Parse("F44336");
-        public static SKColor Pink => SKColor.Parse("E91E63");
-        public static SKColor Purple => SKColor.Parse("9C27B0");
-        public static SKColor DeepPurple => SKColor.Parse("673AB7");
-        public static SKColor Indigo => SKColor.Parse("3F51B5");
-        public static SKColor Blue => SKColor.Parse("2196F3");
-        public static SKColor LightBlue => SKColor.Parse("03A9F4");
-        public static SKColor Cyan => SKColor.Parse("00BCD4");
-        public static SKColor Teal => SKColor.Parse("009688");
-        public static SKColor Green => SKColor.Parse("4CAF50");
-        public static SKColor LightGreen => SKColor.Parse("8BC34A");
-        public static SKColor Lime => SKColor.Parse("CDDC39");
-        public static SKColor Yellow => SKColor.Parse("FFEB3B");
-        public static SKColor Amber => SKColor.Parse("FFC107");
-        public static SKColor Orange => SKColor.Parse("FF9800");
-        public static SKColor DeepOrange => SKColor.Parse("FF5722");
-        public static SKColor Brown => SKColor.Parse("795548");
-        public static SKColor Grey => SKColor.Parse("9E9E9E");
-        public static SKColor BlueGrey => SKColor.Parse("607D8B");
-        public static SKColor Black => SKColor.Parse("000000");
-        public static SKColor White => SKColor.Parse("FFFFFF");
-    }
-
-    public static class PathConstants
-    {
-        public const string Star = "M9 11.3l3.71 2.7-1.42-4.36L15 7h-4.55L9 2.5 7.55 7H3l3.71 2.64L5.29 14z";
-
-        public const string MaterialStar = @"M19.65,9.04l-4.84-0.42l-1.89-4.45c-0.34-0.81-1.5-0.81-1.84,0L9.19,8.63L4.36,9.04c-0.88,0.07-1.24,1.17-0.57,1.7l3.67,3.18l-1.1,4.72c-0.2,0.86,0.73,1.54,1.49,1.08L12,17.27l4.15,2.51c0.76,0.46,1.69-0.22,1.49-1.08l-1.1-4.73l3.67-3.18C20.88,10.21,20.53,9.11,19.65,9.04zM12,15.4l-3.76,2.27l1-4.28l-3.32-2.88l4.38-0.38L12,6.1l1.71,4.04l4.38,0.38l-3.32,2.88l1,4.28L12,15.4z";
-
-        public const string Heart =
-            "M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z";
-
-        public const string Circle = "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2z";
-        public const string Bar = "M6 6h36v2H6z";
-
-        public const string BatteryAlert =
-            "M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v15.33C7 21.4 7.6 22 8.33 22h7.33c.74 0 1.34-.6 1.34-1.33V5.33C17 4.6 16.4 4 15.67 4zM13 18h-2v-2h2v2zm0-4h-2V9h2v5z";
-
-        public const string BatteryCharging =
-            "M15.67 4H14V2h-4v2H8.33C7.6 4 7 4.6 7 5.33v15.33C7 21.4 7.6 22 8.33 22h7.33c.74 0 1.34-.6 1.34-1.33V5.33C17 4.6 16.4 4 15.67 4zM11 20v-5.5H9L13 7v5.5h2L11 20z";
-
-        public const string Like =
-            "M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z";
-
-        public const string Dislike =
-            "M15 3H6c-.83 0-1.54.5-1.84 1.22l-3.02 7.05c-.09.23-.14.47-.14.73v1.91l.01.01L1 14c0 1.1.9 2 2 2h6.31l-.95 4.57-.03.32c0 .41.17.79.44 1.06L9.83 23l6.59-6.59c.36-.36.58-.86.58-1.41V5c0-1.1-.9-2-2-2zm4 0v12h4V3h-4z";
-
-        public const string Theaters =
-            "M18 3v2h-2V3H8v2H6V3H4v18h2v-2h2v2h8v-2h2v2h2V3h-2zM8 17H6v-2h2v2zm0-4H6v-2h2v2zm0-4H6V7h2v2zm10 8h-2v-2h2v2zm0-4h-2v-2h2v2zm0-4h-2V7h2v2z";
-
-        public const string Problem = "M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z";
-    }
-
-    public enum RatingType
-    {
-        Full,
-        Half,
-        Floating
-    }
-
-    public class RatingView : SKCanvasView
-    {
-        public static readonly BindableProperty ValueProperty = BindableProperty.Create(
-            nameof(Value),
-            typeof(double),
-            typeof(RatingView),
-            default(double),
-            propertyChanged: OnValueChanged);
-
-        public static readonly BindableProperty PathProperty = BindableProperty.Create(
-            nameof(Path),
-            typeof(string),
-            typeof(RatingView),
-            PathConstants.Star,
-            propertyChanged: OnPropertyChanged);
-
-        public static readonly BindableProperty CountProperty = BindableProperty.Create(
-            nameof(Count),
-            typeof(int),
-            typeof(RatingView),
-            5,
-            propertyChanged: OnPropertyChanged);
-
-        public static readonly BindableProperty ColorOnProperty = BindableProperty.Create(
-            nameof(ColorOn),
-            typeof(Color),
-            typeof(RatingView),
-            MaterialColors.Amber.ToMauiColor(),
-            propertyChanged: ColorOnChanged);
-
-        public static readonly BindableProperty OutlineOnColorProperty = BindableProperty.Create(
-            nameof(OutlineOnColor),
-            typeof(Color),
-            typeof(RatingView),
-            SKColors.Transparent.ToMauiColor(),
-            propertyChanged: OutlineOnColorChanged);
-
-        public static readonly BindableProperty OutlineOffColorProperty = BindableProperty.Create(
-            nameof(OutlineOffColor),
-            typeof(Color),
-            typeof(RatingView),
-            MaterialColors.Grey.ToMauiColor(),
-            propertyChanged: OutlineOffColorChanged);
-
-        public static readonly BindableProperty RatingTypeProperty = BindableProperty.Create(
-            nameof(RatingType),
-            typeof(RatingType),
-            typeof(RatingView),
-            RatingType.Floating,
-            propertyChanged: OnPropertyChanged);
-
-        public double Value
-        {
-            get => (double)GetValue(ValueProperty);
-            set => SetValue(ValueProperty, ClampValue(value));
-        }
-
-        public string Path
-        {
-            get => (string)GetValue(PathProperty);
-            set => SetValue(PathProperty, value);
-        }
-
-        public int Count
-        {
-            get => (int)GetValue(CountProperty);
-            set => SetValue(CountProperty, value);
-        }
-
-        public Color ColorOn
-        {
-            get => (Color)GetValue(ColorOnProperty);
-            set => SetValue(ColorOnProperty, value);
-        }
-
-        public Color OutlineOnColor
-        {
-            get => (Color)GetValue(OutlineOnColorProperty);
-            set => SetValue(OutlineOnColorProperty, value);
-        }
-
-        public Color OutlineOffColor
-        {
-            get => (Color)GetValue(OutlineOffColorProperty);
-            set => SetValue(OutlineOffColorProperty, value);
-        }
-
-        public RatingType RatingType
-        {
-            get => (RatingType)GetValue(RatingTypeProperty);
-            set => SetValue(RatingTypeProperty, value);
-        }
-
-        private static void OnPropertyChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            var view = bindable as RatingView;
-            view.InvalidateSurface();
-        }
-
-        private static void OnValueChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            OnPropertyChanged(bindable, oldValue, newValue);
-        }
-
-        private static void ColorOnChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            var view = bindable as RatingView;
-            view.SKColorOn = ((Color)newValue).ToSKColor();
-            OnPropertyChanged(bindable, oldValue, newValue);
-        }
-
-        private static void OutlineOffColorChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            var view = bindable as RatingView;
-            view.SKOutlineOffColor = ((Color)newValue).ToSKColor();
-            OnPropertyChanged(bindable, oldValue, newValue);
-        }
-
-        private static void OutlineOnColorChanged(BindableObject bindable, object oldValue, object newValue)
-        {
-            var view = bindable as RatingView;
-            view.SKOutlineOnColor = ((Color)newValue).ToSKColor();
-            OnPropertyChanged(bindable, oldValue, newValue);
-        }
-
-        private SKPoint ConvertToPixel(Point pt)
-        {
-            return new SKPoint((float)(CanvasSize.Width * pt.X / Width), (float)(CanvasSize.Height * pt.Y / Height));
-        }
-
-        #region properties
-
-        /// <summary>
-        ///     Gets or sets the spacing between two rating elements
-        /// </summary>
-        public float Spacing { get; set; } = 8;
-
-        /// <summary>
-        ///     Gets or sets the color of the canvas background.
-        /// </summary>
-        /// <value>The color of the canvas background.</value>
-        public SKColor CanvasBackgroundColor { get; set; } = SKColors.Transparent;
-
-        /// <summary>
-        ///     Gets or sets the width of the stroke.
-        /// </summary>
-        /// <value>The width of the stroke.</value>
-        public float StrokeWidth { get; set; } = 0.1f;
-
-        #endregion
-
-        #region public methods
-
-        /// <summary>
-        ///     Clamps the value between 0 and the number of items.
-        /// </summary>
-        /// <returns>The value.</returns>
-        /// <param name="val">Value.</param>
-        public double ClampValue(double val)
-        {
-            if (val < 0)
-            {
-                return 0;
-            }
-
-            if (val > Count)
-            {
-                return Count;
-            }
-
-            return val;
-        }
-
-        /// <summary>
-        ///     Sets the Rating value
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        public void SetValue(double x, double y)
-        {
-            var val = CalculateValue(x);
-            switch (RatingType)
-            {
-                case RatingType.Full:
-                    Value = ClampValue(Math.Ceiling(val));
-                    break;
-                case RatingType.Half:
-                    Value = ClampValue(Math.Round(val * 2) / 2);
-                    break;
-                case RatingType.Floating:
-                    Value = ClampValue(val);
-                    break;
-            }
-        }
-
-        protected override void OnPaintSurface(SKPaintSurfaceEventArgs e)
-        {
-            base.OnPaintSurface(e);
-
-            Draw(e.Surface.Canvas, e.Info.Width, e.Info.Height);
-        }
-
-        /// <summary>
-        ///     Draws the rating view
-        /// </summary>
-        /// <param name="canvas"></param>
-        /// <param name="width"></param>
-        /// <param name="height"></param>
-        public void Draw(SKCanvas canvas, int width, int height)
-        {
-            canvas.Clear(CanvasBackgroundColor);
-
-            var path = SKPath.ParseSvgPathData(Path);
-
-            var itemWidth = (width - (Count - 1) * Spacing) / Count;
-            var scaleX = itemWidth / path.Bounds.Width;
-            scaleX = (itemWidth - scaleX * StrokeWidth) / path.Bounds.Width;
-
-            ItemHeight = height;
-            var scaleY = ItemHeight / path.Bounds.Height;
-            scaleY = (ItemHeight - scaleY * StrokeWidth) / path.Bounds.Height;
-
-            CanvasScale = Math.Min(scaleX, scaleY);
-            ItemWidth = path.Bounds.Width * CanvasScale;
-
-            canvas.Scale(CanvasScale);
-            canvas.Translate(StrokeWidth / 2, StrokeWidth / 2);
-            canvas.Translate(-path.Bounds.Left, 0);
-            canvas.Translate(0, -path.Bounds.Top);
-
-            using (var strokePaint = new SKPaint
-            {
-                Style = SKPaintStyle.Stroke,
-                Color = SKOutlineOnColor,
-                StrokeWidth = StrokeWidth,
-                StrokeJoin = SKStrokeJoin.Round,
-                IsAntialias = true,
-            })
-            using (var fillPaint = new SKPaint { Style = SKPaintStyle.Fill, Color = SKColorOn, IsAntialias = true, })
-            {
-                for (var i = 0; i < Count; i++)
-                {
-                    if (i <= Value - 1) // Full
-                    {
-                        canvas.DrawPath(path, fillPaint);
-                        canvas.DrawPath(path, strokePaint);
-                    }
-                    else if (i < Value) //Partial
-                    {
-                        var filledPercentage = (float)(Value - Math.Truncate(Value));
-                        strokePaint.Color = SKOutlineOffColor;
-                        canvas.DrawPath(path, strokePaint);
-
-                        using (var rectPath = new SKPath())
-                        {
-                            var rect = SKRect.Create(
-                                path.Bounds.Left + path.Bounds.Width * filledPercentage,
-                                path.Bounds.Top,
-                                path.Bounds.Width * (1 - filledPercentage),
-                                ItemHeight);
-                            rectPath.AddRect(rect);
-                            canvas.ClipPath(rectPath, SKClipOperation.Difference);
-                            canvas.DrawPath(path, fillPaint);
-                        }
-                    }
-                    else //Empty
-                    {
-                        strokePaint.Color = SKOutlineOffColor;
-                        canvas.DrawPath(path, strokePaint);
-                    }
-
-                    canvas.Translate((ItemWidth + Spacing) / CanvasScale, 0);
-                }
-            }
-        }
-
-        #endregion
-
-        #region private
-
-        private float ItemWidth { get; set; }
-        private float ItemHeight { get; set; }
-        private float CanvasScale { get; set; }
-        private SKColor SKColorOn { get; set; } = MaterialColors.Amber;
-        private SKColor SKOutlineOnColor { get; set; } = SKColors.Transparent;
-        private SKColor SKOutlineOffColor { get; set; } = MaterialColors.Grey;
-
-        private double CalculateValue(double x)
-        {
-            if (x < ItemWidth)
-            {
-                return x / ItemWidth;
-            }
-
-            if (x < ItemWidth + Spacing)
-            {
-                return 1;
-            }
-
-            return 1 + CalculateValue(x - (ItemWidth + Spacing));
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/Maui/MauiSample/Presentation/Views/SillyHorizontalCell.xaml b/Maui/MauiSample/Presentation/Views/SillyHorizontalCell.xaml
index c0e29d3..f950992 100644
--- a/Maui/MauiSample/Presentation/Views/SillyHorizontalCell.xaml
+++ b/Maui/MauiSample/Presentation/Views/SillyHorizontalCell.xaml
@@ -3,8 +3,8 @@
     x:Class="MauiSample.Presentation.Views.SillyHorizontalCell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:AlohaKit.Controls;assembly=AlohaKit"
     xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
-    xmlns:views="clr-namespace:MauiSample.Presentation.Views"
     x:DataType="viewModels:SillyDudeVmo"
     Stroke="{StaticResource DarkCardBorder}"
     StrokeThickness="2">
@@ -28,11 +28,11 @@
             Aspect="AspectFill"
             Source="{Binding ImageUrl}" />
 
-        <BoxView
+        <ContentView
             Grid.Row="1"
             Grid.RowSpan="3"
             Margin="-16,0"
-            Color="{StaticResource DarkOverlay}" />
+            BackgroundColor="{StaticResource DarkOverlay}" />
 
         <Label
             Grid.Row="1"
@@ -47,18 +47,19 @@
             Text="{Binding Role}"
             TextColor="White" />
 
-        <views:RatingView
+        <controls:Rating
             Grid.Row="3"
-            ColorOn="{StaticResource Accent}"
-            Count="5"
-            HeightRequest="20"
-            HorizontalOptions="Start"
-            OutlineOffColor="Transparent"
-            RatingType="Floating"
-            VerticalOptions="Center"
-            WidthRequest="66"
+            BackgroundColor="Transparent"
+            ItemsCount="5"
+            Scale="0.7"
+            SelectedFill="{StaticResource Accent}"
+            SelectedStrokeWidth="0"
+            SelectedStroke="Transparent"
+            TranslationX="-50"
+            UnSelectedFill="Transparent"
+            UnSelectedStroke="Transparent"
+            UnSelectedStrokeWidth="0"
+            VerticalOptions="Start"
             Value="{Binding SillinessDegree}" />
-
-
     </Grid>
 </Border>
\ No newline at end of file
diff --git a/Maui/MauiSample/Presentation/Views/SillyListCell.xaml b/Maui/MauiSample/Presentation/Views/SillyListCell.xaml
index b895a85..af6a4fb 100644
--- a/Maui/MauiSample/Presentation/Views/SillyListCell.xaml
+++ b/Maui/MauiSample/Presentation/Views/SillyListCell.xaml
@@ -3,6 +3,7 @@
     x:Class="MauiSample.Presentation.Views.SillyListCell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:AlohaKit.Controls;assembly=AlohaKit"
     xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
     xmlns:views="clr-namespace:MauiSample.Presentation.Views"
     Padding="{StaticResource StandardPadding}"
@@ -40,15 +41,18 @@
 
             <Label Style="{StaticResource TextCaptionSecondary}" Text="{Binding Role}" />
 
-            <views:RatingView
-                Margin="0,5,0,0"
-                ColorOn="{StaticResource Accent}"
-                Count="5"
-                HeightRequest="30"
-                HorizontalOptions="Start"
-                OutlineOffColor="Transparent"
-                RatingType="Full"
-                WidthRequest="100"
+            <controls:Rating
+                BackgroundColor="Transparent"
+                ItemsCount="5"
+                Scale="0.6"
+                SelectedFill="{StaticResource Accent}"
+                SelectedStroke="Transparent"
+                SelectedStrokeWidth="0"
+                TranslationX="-30"
+                UnSelectedFill="Transparent"
+                UnSelectedStroke="Transparent"
+                UnSelectedStrokeWidth="0"
+                VerticalOptions="Start"
                 Value="{Binding SillinessDegree}" />
         </StackLayout>
 
diff --git a/Maui/MauiSample/Resources/AppIcon/appicon.svg b/Maui/MauiSample/Resources/AppIcon/appicon.svg
index 9d63b65..6f5160f 100644
--- a/Maui/MauiSample/Resources/AppIcon/appicon.svg
+++ b/Maui/MauiSample/Resources/AppIcon/appicon.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
-    <rect x="0" y="0" width="456" height="456" fill="#512BD4" />
+    <rect x="0" y="0" width="456" height="456" fill="#d81b60" />
 </svg>
\ No newline at end of file
diff --git a/Maui/MauiSample/Resources/AppIcon/logo.png b/Maui/MauiSample/Resources/AppIcon/logo.png
new file mode 100644
index 0000000..42446b3
Binary files /dev/null and b/Maui/MauiSample/Resources/AppIcon/logo.png differ
diff --git a/Maui/MauiSample/Resources/Splash/logo.png b/Maui/MauiSample/Resources/Splash/logo.png
new file mode 100644
index 0000000..42446b3
Binary files /dev/null and b/Maui/MauiSample/Resources/Splash/logo.png differ
diff --git a/Maui/MauiSample/Resources/Styles/Colors.xaml b/Maui/MauiSample/Resources/Styles/Colors.xaml
index cad1013..713a427 100644
--- a/Maui/MauiSample/Resources/Styles/Colors.xaml
+++ b/Maui/MauiSample/Resources/Styles/Colors.xaml
@@ -4,10 +4,14 @@
 
     <Color x:Key="DarklessSurface">#3D3D3D</Color>
 
+    <Color x:Key="DarkDraggedSurface">#4D4D4D</Color>
+
     <Color x:Key="DarkCardBorder">#3A3A3A</Color>
 
     <Color x:Key="DarkSurface">#383838</Color>
 
+    <Color x:Key="DarkOverlay">#CC000000</Color>
+
     <Color x:Key="DarkerSurface">#323232</Color>
 
     <Color x:Key="LightSurface">#FAF8F9</Color>
diff --git a/Maui/Sharpnado.CollectionView.Maui/MauiAppBuilderExtensions.cs b/Maui/Sharpnado.CollectionView.Maui/MauiAppBuilderExtensions.cs
index 365b034..890cb04 100644
--- a/Maui/Sharpnado.CollectionView.Maui/MauiAppBuilderExtensions.cs
+++ b/Maui/Sharpnado.CollectionView.Maui/MauiAppBuilderExtensions.cs
@@ -16,18 +16,16 @@ public static MauiAppBuilder UseSharpnadoCollectionView(
         builder.ConfigureMauiHandlers(handlers =>
         {
 #if __ANDROID__
-            handlers.AddCompatibilityRenderer<CollectionView, Sharpnado.CollectionView.Droid.Renderers.CollectionViewRenderer>();
+            handlers.AddHandler<CollectionView, Sharpnado.CollectionView.Droid.Renderers.CollectionViewRenderer>();
 #elif __IOS__
-            // handlers.AddCompatibilityRenderer<CollectionView, Sharpnado.CollectionView.Droid.Renderers.CollectionViewRenderer>();
+            handlers.AddHandler<CollectionView, Sharpnado.CollectionView.iOS.Renderers.CollectionViewRenderer>();
 #endif
         });
 
 #if __ANDROID__
         Sharpnado.CollectionView.Droid.Initializer.Initialize(loggerEnable, debugLogEnable);
 #elif __IOS__
-        // Sharpnado.Tabs.Effects.iOS.CommandsPlatform.Init();
-        // Sharpnado.Tabs.Effects.iOS.TouchEffectPlatform.Init();
-        // Sharpnado.Tabs.iOS.iOSTintableImageEffect.Init();
+        Sharpnado.CollectionView.iOS.Initializer.Initialize(loggerEnable, debugLogEnable);
 #endif
 
         return builder;
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniExtensions.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniExtensions.cs
new file mode 100644
index 0000000..e499bad
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public static class JniExtensions
+    {
+        public static bool IsNullOrDisposed(this Java.Lang.Object javaObject)
+        {
+            return javaObject == null || javaObject.Handle == IntPtr.Zero;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniWeakReference.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniWeakReference.cs
new file mode 100644
index 0000000..0a46b2e
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/JniWeakReference.cs
@@ -0,0 +1,34 @@
+using System;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public class JniWeakReference<T>
+        where T : Java.Lang.Object
+    {
+        private readonly WeakReference<T> _reference;
+
+        public JniWeakReference(T target)
+        {
+            _reference = new WeakReference<T>(target);
+        }
+
+        public bool TryGetTarget(out T target)
+        {
+            target = null;
+            if (_reference.TryGetTarget(out var innerTarget))
+            {
+                if (innerTarget.Handle != IntPtr.Zero)
+                {
+                    target = innerTarget;
+                }
+            }
+
+            return target != null;
+        }
+
+        public override string ToString()
+        {
+            return $"[JniWeakReference] {_reference}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/PlatformHelper.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/PlatformHelper.cs
new file mode 100644
index 0000000..7bc4831
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/PlatformHelper.cs
@@ -0,0 +1,63 @@
+using System;
+
+using Android.Content.Res;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public class AndroidPlatformHelper : PlatformHelper
+    {
+        public override int DpToPixels(int dp, Rounding rounding = Rounding.Round) => DpToPixels((double)dp, rounding);
+
+        public override int DpToPixels(double dp, Rounding rounding = Rounding.Round)
+        {
+            switch (rounding)
+            {
+                case Rounding.Round:
+                    return (int)Math.Round(dp * Resources.System.DisplayMetrics.Density);
+                case Rounding.Floor:
+                    return (int)Math.Floor(dp * Resources.System.DisplayMetrics.Density);
+                default:
+                    return (int)Math.Ceiling(dp * Resources.System.DisplayMetrics.Density);
+            }
+        }
+
+        public override double PixelsToDp(double pixels)
+        {
+            return Math.Floor((pixels / Resources.System.DisplayMetrics.Density) * 100) / 100;
+        }
+
+        public override string DumpNativeViewHierarchy(View formsView, bool verbose)
+        {
+#if NET6_0_OR_GREATER
+            if (formsView.Handler?.PlatformView is not Android.Views.View nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpHierarchy(verbose) ?? "null renderer";
+#else
+            var renderer = Platform.GetRenderer(formsView);
+            Platform.SetRenderer(formsView, renderer);
+            return renderer?.View.DumpHierarchy(verbose) ?? "null renderer";
+#endif
+        }
+
+        public override string DumpNativeViewInfo(View formsView)
+        {
+#if NET6_0_OR_GREATER
+            if (formsView.Handler?.PlatformView is not Android.Views.View nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpInfo() ?? "null renderer";
+#else
+            var renderer = Platform.GetRenderer(formsView);
+            Platform.SetRenderer(formsView, renderer);
+            return renderer?.View.DumpInfo() ?? "null renderer";
+#endif
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewExtensions.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewExtensions.cs
new file mode 100644
index 0000000..fee606f
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewExtensions.cs
@@ -0,0 +1,39 @@
+using System;
+
+using Android.Views;
+
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public static class ViewExtensions
+    {
+        private const int IndentCount = 4;
+
+        private const string StringFormat = "Dumping Android view hierarchy:{0}{1}";
+
+        public static string DumpHierarchy(this View view, bool isVerbose)
+        {
+            var hierarchyStringBuilder = new ViewHierarchyStringBuilder(IndentCount);
+            ViewVisitor.Visit(view, hierarchyStringBuilder.Add, isVerbose);
+            return string.Format(StringFormat, Environment.NewLine, hierarchyStringBuilder);
+        }
+
+        public static string DumpInfo(this View view)
+        {
+            string indentSpace = $"{Environment.NewLine}    ";
+
+            var result = $"Dumping info for {view.GetType().Name}:"
+                + indentSpace + $"MeasuredSize: ( {view.MeasuredWidth}w, {view.MeasuredHeight}h )"
+                + indentSpace + $"Padding: ( {view.PaddingLeft}l, {view.PaddingTop}t, {view.PaddingRight}r, {view.PaddingBottom}b )";
+
+            if (view.LayoutParameters is ViewGroup.MarginLayoutParams marginParams)
+            {
+                result += indentSpace
+                    + $"Margins: ( {marginParams.LeftMargin}l, {marginParams.TopMargin}t, {marginParams.RightMargin}r, {marginParams.BottomMargin}b )";
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewHierarchyPrinter.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewHierarchyPrinter.cs
new file mode 100644
index 0000000..6b92da6
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewHierarchyPrinter.cs
@@ -0,0 +1,57 @@
+using System.Text;
+
+using Android.Views;
+
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public class ViewHierarchyStringBuilder
+    {
+        private readonly StringBuilder _stringBuilder;
+
+        private readonly string _indentSpace;
+
+        public ViewHierarchyStringBuilder(int indentCount)
+        {
+            _stringBuilder = new StringBuilder();
+            _indentSpace = string.Empty.PadLeft(indentCount);
+        }
+
+        public void Add(View view, int depth, bool isVerbose = false)
+        {
+            for (int i = 0; i < depth; i++)
+            {
+                _stringBuilder.Append(_indentSpace);
+            }
+
+            _stringBuilder.Append($"<{view.GetType().Name}");
+
+            if (isVerbose)
+            {
+                _stringBuilder.Append($" X: {view.GetX()}, Y: {view.GetY()}, Width: {view.Width}, Height: {view.Height}");
+
+                string layoutParams;
+                if (view.LayoutParameters is ViewGroup.MarginLayoutParams marginLayout)
+                {
+                    layoutParams = $", MarginLayoutParams: {{ {view.LayoutParameters.Width}, {view.LayoutParameters.Height}, {marginLayout.LeftMargin}l, {marginLayout.TopMargin}t, {marginLayout.RightMargin}r, {marginLayout.BottomMargin}b }}";
+                }
+                else
+                {
+                    layoutParams = view.LayoutParameters != null
+                        ? $", LayoutParams: {{ {view.LayoutParameters.Width}, {view.LayoutParameters.Height} }}"
+                        : ", LayoutParams is null";
+                }
+
+                _stringBuilder.Append(layoutParams);
+            }
+
+            _stringBuilder.AppendLine(">");
+        }
+
+        public override string ToString()
+        {
+            return _stringBuilder.ToString();
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewVisitor.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewVisitor.cs
new file mode 100644
index 0000000..ec177a6
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Helpers/ViewVisitor.cs
@@ -0,0 +1,34 @@
+using System;
+
+using Android.Views;
+
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Helpers
+{
+    public static class ViewVisitor
+    {
+        public static void Visit(View view, Action<View, int,  bool> action, bool isVerbose)
+        {
+            Visit(view, action, 0, isVerbose);
+        }
+
+        private static void Visit(object @object, Action<View, int, bool> action, int currentDepth, bool isVerbose)
+        {
+            if (!(@object is View view))
+            {
+                return;
+            }
+
+            action(view, currentDepth, isVerbose);
+
+            if (view is ViewGroup viewGroup)
+            {
+                for (int i = 0; i < viewGroup.ChildCount; i++)
+                {
+                    Visit(viewGroup.GetChildAt(i), action, currentDepth + 1, isVerbose);
+                }
+            }
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Initializer.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Initializer.cs
new file mode 100644
index 0000000..0142a34
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Initializer.cs
@@ -0,0 +1,15 @@
+using Sharpnado.CollectionView.Droid.Helpers;
+using Sharpnado.CollectionView.Droid.Renderers;
+
+namespace Sharpnado.CollectionView.Droid
+{
+    public static class Initializer
+    {
+        public static void Initialize(bool enableInternalLogger = false, bool enableInternalDebugLogger = false)
+        {
+            InternalLogger.EnableLogger(enableInternalLogger, enableInternalDebugLogger);
+            PlatformHelper.InitializeSingleton(new AndroidPlatformHelper());
+            CollectionViewRenderer.Initialize();
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CellCache.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CellCache.cs
new file mode 100644
index 0000000..df23330
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CellCache.cs
@@ -0,0 +1,162 @@
+using System.Collections.Generic;
+
+using Android.Views;
+
+using Xamarin.Forms;
+
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class CellCache
+    {
+        private readonly IList<ViewCellHolder> _viewCellCache;
+        private readonly int _cacheSize;
+
+        public CellCache(int initialSize, int cacheSize = 0)
+        {
+            _cacheSize = cacheSize;
+
+            if (cacheSize == -1)
+            {
+                // Cache disabled
+                _viewCellCache = new List<ViewCellHolder>();
+                return;
+            }
+
+            if (_cacheSize > 0)
+            {
+                initialSize = initialSize > _cacheSize ? _cacheSize : initialSize;
+            }
+
+            _viewCellCache = new List<ViewCellHolder>(initialSize);
+            for (int i = 0; i < initialSize; i++)
+            {
+                _viewCellCache.Add(new ViewCellHolder());
+            }
+        }
+
+        public int Count => _viewCellCache.Count;
+
+        public void Clear()
+        {
+            foreach (var holder in _viewCellCache)
+            {
+                if (holder.CachedView is ViewGroup viewGroup)
+                {
+                    viewGroup.RemoveAllViews();
+                }
+
+                holder.CachedView?.Dispose();
+            }
+
+            _viewCellCache.Clear();
+        }
+
+        public void IncrementSize()
+        {
+            if (_cacheSize == -1)
+            {
+                return;
+            }
+
+            if (_cacheSize > 0 && _viewCellCache.Count == _cacheSize)
+            {
+                return;
+            }
+
+            _viewCellCache.Add(new ViewCellHolder());
+        }
+
+        public void Remove(int index)
+        {
+            if (_cacheSize == -1)
+            {
+                return;
+            }
+
+            index = PreProcessIndex(index);
+
+            _viewCellCache.RemoveAt(index);
+        }
+
+        public void AddOrUpdateView(int index, View view)
+        {
+            if (_cacheSize == -1)
+            {
+                return;
+            }
+
+            index = PreProcessIndex(index);
+
+            _viewCellCache[index].CachedView = view;
+        }
+
+        public void AddOrUpdateViewCell(int index, ViewCell view)
+        {
+            if (_cacheSize == -1)
+            {
+                return;
+            }
+
+            index = PreProcessIndex(index);
+
+            _viewCellCache[index].CachedCell = view;
+        }
+
+        public bool TryGetView(int index, out View view)
+        {
+            if (_cacheSize == -1)
+            {
+                view = null;
+                return false;
+            }
+
+            index = PreProcessIndex(index);
+
+            view = _viewCellCache[index].CachedView;
+            return view != null;
+        }
+
+        public bool TryGetCell(int index, out ViewCell cell)
+        {
+            if (_cacheSize == -1)
+            {
+                cell = null;
+                return false;
+            }
+
+            index = PreProcessIndex(index);
+
+            cell = _viewCellCache[index].CachedCell;
+            return cell != null;
+        }
+
+        public void Swap(int firstIndex, int secondIndex)
+        {
+            if (_cacheSize == -1)
+            {
+                return;
+            }
+
+            firstIndex = PreProcessIndex(firstIndex);
+            secondIndex = PreProcessIndex(secondIndex);
+
+            ViewCellHolder tmp = _viewCellCache[firstIndex];
+            _viewCellCache[firstIndex] = _viewCellCache[secondIndex];
+            _viewCellCache[secondIndex] = tmp;
+        }
+
+        private int PreProcessIndex(int index)
+        {
+            return _cacheSize > 0 ? index % _cacheSize : index;
+        }
+
+        private class ViewCellHolder
+        {
+            public ViewCell CachedCell { get; set; }
+
+            public View CachedView { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CenterSnapHelper.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CenterSnapHelper.cs
new file mode 100644
index 0000000..f6f9365
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CenterSnapHelper.cs
@@ -0,0 +1,97 @@
+using System;
+
+using Android.Runtime;
+using Android.Views;
+
+using AndroidX.RecyclerView.Widget;
+
+using View = Android.Views.View;
+
+#if __ANDROID_29__
+
+#else
+using Android.Support.V7.Widget;
+#endif
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class CenterSnapHelper : LinearSnapHelper
+    {
+        public CenterSnapHelper(CollectionViewRenderer nativeView)
+        {
+            WeakNativeView = new WeakReference<CollectionViewRenderer>(nativeView);
+        }
+
+        public CenterSnapHelper(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(javaReference, transfer)
+        {
+        }
+
+        protected WeakReference<CollectionViewRenderer> WeakNativeView { get; }
+
+        public override int FindTargetSnapPosition(RecyclerView.LayoutManager layoutManager, int velocityX, int velocityY)
+        {
+            var targetSnapPosition = base.FindTargetSnapPosition(layoutManager, velocityX, velocityY);
+            InternalLogger.Info($"FindTargetSnapPosition() : {targetSnapPosition}");
+
+            if (WeakNativeView.TryGetTarget(out var target))
+            {
+                target.IsSnapHelperBusy = targetSnapPosition == -1;
+                target.CurrentSnapIndex = targetSnapPosition > -1 ? targetSnapPosition : target.CurrentSnapIndex;
+                System.Diagnostics.Debug.WriteLine($">>>>>> CurrentSnapIndex: {target.CurrentSnapIndex}");
+            }
+
+            return targetSnapPosition;
+        }
+
+        public override View FindSnapView(RecyclerView.LayoutManager layoutManager)
+        {
+            InternalLogger.Info($"FindSnapView()");
+
+            View snapView = null;
+            if (WeakNativeView.TryGetTarget(out var target))
+            {
+                int firstIndex = target.LinearLayoutManager.FindFirstCompletelyVisibleItemPosition();
+                if (firstIndex == 0)
+                {
+                    // Check if first item is fully visible, if true don't snap.
+                    snapView = target.LinearLayoutManager.FindViewByPosition(firstIndex);
+                    InternalLogger.Info("Getting first view for snap: overriding center snap behavior");
+                }
+
+                int lastIndex = target.LinearLayoutManager.FindLastCompletelyVisibleItemPosition();
+                if (lastIndex == target.Control.GetAdapter()?.ItemCount - 1)
+                {
+                    // Check if last item is fully visible, if true don't snap.
+                    snapView = target.LinearLayoutManager.FindViewByPosition(lastIndex);
+                    InternalLogger.Info("Getting last view for snap: overriding center snap behavior");
+                }
+            }
+
+            if (snapView == null)
+            {
+                snapView = base.FindSnapView(layoutManager);
+            }
+
+            ReleaseIsBusy(snapView);
+
+            return snapView;
+        }
+
+        protected void ReleaseIsBusy(View snapView)
+        {
+            if (WeakNativeView.TryGetTarget(out var target))
+            {
+                target.IsSnapHelperBusy = false;
+
+                if (snapView != null)
+                {
+                    var viewHolder = target.Control.FindContainingViewHolder(snapView);
+                    target.CurrentSnapIndex = viewHolder.AdapterPosition;
+
+                    // System.Diagnostics.Debug.WriteLine($">>>>>> CurrentSnapIndex: {target.CurrentSnapIndex}");
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.DragAnDropItemTouchHelperCallback.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.DragAnDropItemTouchHelperCallback.cs
new file mode 100644
index 0000000..eb15d68
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.DragAnDropItemTouchHelperCallback.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Windows.Input;
+
+using Android.Runtime;
+
+using AndroidX.RecyclerView.Widget;
+
+using Sharpnado.CollectionView.ViewModels;
+
+using Xamarin.Forms;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public partial class CollectionViewRenderer
+    {
+        private class DragAnDropItemTouchHelperCallback : ItemTouchHelper.Callback
+        {
+            private readonly CollectionView _collection;
+
+            private readonly RecycleViewAdapter _recycleViewAdapter;
+            private readonly ICommand _onDragAndDropdEnded;
+            private readonly ICommand _onDragAndDropStart;
+
+            private int _from = -1;
+            private int _to = -1;
+
+            private DraggableViewCell _draggedViewCell;
+
+            private bool _isRefreshViewUserEnabled = false;
+
+            public DragAnDropItemTouchHelperCallback(IntPtr handle, JniHandleOwnership transfer)
+                : base(handle, transfer)
+            {
+            }
+
+            public DragAnDropItemTouchHelperCallback(CollectionView collection, RecycleViewAdapter recycleViewAdapter, ICommand onDragAndDropStart = null, ICommand onDragAndDropdEnded = null)
+            {
+                _collection = collection;
+                _recycleViewAdapter = recycleViewAdapter;
+                _onDragAndDropStart = onDragAndDropStart;
+                _onDragAndDropdEnded = onDragAndDropdEnded;
+            }
+
+            public override bool IsLongPressDragEnabled => _collection.DragAndDropTrigger == DragAndDropTrigger.LongTap;
+
+            public override int GetMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder)
+            {
+                if (((ViewHolder)viewHolder).ViewCell is DraggableViewCell draggableViewCell
+                    && !draggableViewCell.IsDraggable)
+                {
+                    return 0;
+                }
+
+                switch (_collection.DragAndDropDirection)
+                {
+                    case DragAndDropDirection.VerticalOnly:
+                        return MakeMovementFlags(ItemTouchHelper.Up | ItemTouchHelper.Down, 0);
+                    case DragAndDropDirection.HorizontalOnly:
+                        return MakeMovementFlags(ItemTouchHelper.Left | ItemTouchHelper.Right, 0);
+                }
+
+                return MakeMovementFlags(ItemTouchHelper.Left | ItemTouchHelper.Right | ItemTouchHelper.Up | ItemTouchHelper.Down, 0);
+            }
+
+            public override void OnSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState)
+            {
+                base.OnSelectedChanged(viewHolder, actionState);
+
+                if (actionState == ItemTouchHelper.ActionStateDrag)
+                {
+                    _collection.IsDragAndDropping = true;
+                    if (_collection.IsInPullToRefresh() && _collection.Parent is ContentView refreshView)
+                    {
+                        _isRefreshViewUserEnabled = refreshView.IsEnabled;
+                        refreshView.IsEnabled = false;
+                    }
+
+                    if (((ViewHolder)viewHolder).ViewCell is DraggableViewCell draggableViewCell)
+                    {
+                        // System.Diagnostics.Debug.WriteLine($">>>>> OnSelectedChanged( {draggableViewCell.BindingContext} IsDragAndDropping: true )");
+                        draggableViewCell.IsDragAndDropping = true;
+                        _draggedViewCell = draggableViewCell;
+                    }
+
+                    _onDragAndDropStart?.Execute(new DragAndDropInfo(
+                        viewHolder.AdapterPosition,
+                        -1,
+                        ((ViewHolder)viewHolder).BindingContext));
+                }
+                else if (actionState == ItemTouchHelper.ActionStateIdle)
+                {
+                    _collection.IsDragAndDropping = false;
+                    if (_collection.IsInPullToRefresh() && _collection.Parent is ContentView refreshView && _isRefreshViewUserEnabled)
+                    {
+                        refreshView.IsEnabled = true;
+                    }
+
+                    if (_draggedViewCell != null)
+                    {
+                        // System.Diagnostics.Debug.WriteLine($">>>>> OnSelectedChanged( {_draggedViewCell.BindingContext} IsDragAndDropping: false )");
+                        _draggedViewCell.IsDragAndDropping = false;
+                        _draggedViewCell = null;
+                    }
+                }
+            }
+
+            public override bool OnMove(
+                RecyclerView recyclerView,
+                RecyclerView.ViewHolder viewHolder,
+                RecyclerView.ViewHolder target)
+            {
+                if (((ViewHolder)target).ViewCell is DraggableViewCell draggableViewCell
+                    && !draggableViewCell.IsDraggable)
+                {
+                    return false;
+                }
+
+                if (_from == -1)
+                {
+                    _from = viewHolder.AdapterPosition;
+                }
+
+                _to = target.AdapterPosition;
+
+                // System.Diagnostics.Debug.WriteLine($">>>>> OnMove( from: {_from}, to: {_to} )");
+                _recycleViewAdapter.OnItemMoving(viewHolder.AdapterPosition, target.AdapterPosition);
+
+                return true;
+            }
+
+            public override void OnMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y)
+            {
+                base.OnMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
+
+                // recompute items offsets
+                recyclerView.InvalidateItemDecorations();
+            }
+
+            public override int InterpolateOutOfBoundsScroll(
+                RecyclerView recyclerView,
+                int viewSize,
+                int viewSizeOutOfBounds,
+                int totalSize,
+                long msSinceStartScroll)
+            {
+                int result = Math.Sign(viewSizeOutOfBounds) * 30;
+                return result;
+            }
+
+            public override float GetMoveThreshold(RecyclerView.ViewHolder viewHolder)
+            {
+                float result = 1f;
+                return result;
+            }
+
+            public override void ClearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder)
+            {
+                base.ClearView(recyclerView, viewHolder);
+
+                if (_from > -1 && _to > -1)
+                {
+                    _recycleViewAdapter.OnItemMovedFromDragAndDrop(_from, _to);
+                    _onDragAndDropdEnded?.Execute(new DragAndDropInfo(
+                        _from,
+                        _to,
+                        ((ViewHolder)viewHolder).BindingContext));
+                    _from = _to = -1;
+                }
+            }
+
+            public override void OnSwiped(RecyclerView.ViewHolder viewHolder, int direction)
+            {
+                throw new NotSupportedException();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.OnControlScrollChangedListener.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.OnControlScrollChangedListener.cs
new file mode 100644
index 0000000..09adb66
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.OnControlScrollChangedListener.cs
@@ -0,0 +1,179 @@
+using System;
+using System.Threading;
+
+using Android.Runtime;
+
+using AndroidX.RecyclerView.Widget;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public partial class CollectionViewRenderer
+    {
+        private class OnControlScrollChangedListener : RecyclerView.OnScrollListener
+        {
+            private readonly WeakReference<CollectionViewRenderer> _weakNativeView;
+            private readonly CollectionView _element;
+
+            private CancellationTokenSource _cts;
+            private int _lastVisibleItemIndex = -1;
+
+            private int _currentOffset = 0;
+
+            public OnControlScrollChangedListener(IntPtr handle, JniHandleOwnership transfer)
+                : base(handle, transfer)
+            {
+            }
+
+            public OnControlScrollChangedListener(
+                CollectionViewRenderer nativeView,
+                CollectionView element)
+            {
+                _weakNativeView = new WeakReference<CollectionViewRenderer>(nativeView);
+                _element = element;
+            }
+
+            public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
+            {
+                base.OnScrolled(recyclerView, dx, dy);
+
+                _currentOffset += dx;
+
+                var infiniteListLoader = _element?.InfiniteListLoader;
+                if (infiniteListLoader == null)
+                {
+                    return;
+                }
+
+                var linearLayoutManager = (LinearLayoutManager)recyclerView.GetLayoutManager();
+                int lastVisibleItem = linearLayoutManager.FindLastVisibleItemPosition();
+                if (_lastVisibleItemIndex == lastVisibleItem)
+                {
+                    return;
+                }
+
+                _lastVisibleItemIndex = lastVisibleItem;
+
+                // InternalLogger.Info($"OnScrolled( lastVisibleItem: {lastVisibleItem} )");
+                infiniteListLoader.OnScroll(lastVisibleItem);
+            }
+
+            public override void OnScrollStateChanged(RecyclerView recyclerView, int newState)
+            {
+                InternalLogger.Info($"OnScrollStateChanged( newState: {newState} )");
+                switch (newState)
+                {
+                    case RecyclerView.ScrollStateDragging:
+                    {
+                        if (!_weakNativeView.TryGetTarget(out CollectionViewRenderer nativeView))
+                        {
+                            return;
+                        }
+
+                        if (nativeView.IsScrolling)
+                        {
+                            return;
+                        }
+
+                        if (_cts != null && !_cts.IsCancellationRequested)
+                        {
+                            // System.Diagnostics.Debug.WriteLine("DEBUG_SCROLL: Cancelling previous update index task");
+                            _cts.Cancel();
+                        }
+
+                        nativeView.IsScrolling = true;
+
+                        // System.Diagnostics.Debug.WriteLine("DEBUG_SCROLL: BeginScroll command");
+                        _element.ScrollBeganCommand?.Execute(null);
+                        break;
+                    }
+
+                    case RecyclerView.ScrollStateSettling:
+                    {
+                        if (!_weakNativeView.TryGetTarget(out CollectionViewRenderer nativeView))
+                        {
+                            return;
+                        }
+
+                        nativeView.IsScrolling = true;
+                        break;
+                    }
+
+                    case RecyclerView.ScrollStateIdle:
+                    {
+                        if (!_weakNativeView.TryGetTarget(out CollectionViewRenderer nativeView))
+                        {
+                            return;
+                        }
+
+                        if (!nativeView.IsScrolling)
+                        {
+                            // System.Diagnostics.Debug.WriteLine("DEBUG_SCROLL: returning !nativeView.IsScrolling");
+                            return;
+                        }
+
+                        if (nativeView.IsSnapHelperBusy)
+                        {
+                            // System.Diagnostics.Debug.WriteLine("DEBUG_SCROLL: returning nativeView.IsSnapHelperBusy");
+                            return;
+                        }
+
+                        nativeView.IsScrolling = false;
+
+                        _cts = new CancellationTokenSource();
+                        UpdateCurrentIndex(nativeView, _cts.Token);
+                        _element.ScrollEndedCommand?.Execute(null);
+
+                        break;
+                    }
+                }
+            }
+
+            private void UpdateCurrentIndex(
+                CollectionViewRenderer nativeView,
+                CancellationToken token)
+            {
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                if (nativeView?.LinearLayoutManager == null || _element == null)
+                {
+                    return;
+                }
+
+                nativeView._isCurrentIndexUpdateBackfire = true;
+                try
+                {
+                    int newIndex = -1;
+                    if (_element.SnapStyle != SnapStyle.None)
+                    {
+                        newIndex = nativeView.CurrentSnapIndex;
+                    }
+                    else
+                    {
+                        newIndex = nativeView.LinearLayoutManager.FindFirstCompletelyVisibleItemPosition();
+                        if (newIndex == -1)
+                        {
+                            newIndex = nativeView.LinearLayoutManager.FindFirstVisibleItemPosition();
+                        }
+                    }
+
+                    if (newIndex == -1)
+                    {
+                        InternalLogger.Warn(
+                            "Failed to find the current index: UpdateCurrentIndex returns nothing");
+                        return;
+                    }
+
+                    _element.CurrentIndex = newIndex;
+                    InternalLogger.Info($"CurrentIndex: {_element.CurrentIndex}");
+                }
+                finally
+                {
+                    nativeView._isCurrentIndexUpdateBackfire = false;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.RecycleViewAdapter.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.RecycleViewAdapter.cs
new file mode 100644
index 0000000..d3e19b4
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.RecycleViewAdapter.cs
@@ -0,0 +1,617 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows.Input;
+
+using Android.Content;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+
+using AndroidX.RecyclerView.Widget;
+
+using Sharpnado.CollectionView.Droid.Helpers;
+using Sharpnado.CollectionView.Helpers;
+using Sharpnado.Tasks;
+
+using IList = System.Collections.IList;
+using Platform = Microsoft.Maui.Controls.Compatibility.Platform.Android.Platform;
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public partial class CollectionViewRenderer
+    {
+        private class ViewHolder : RecyclerView.ViewHolder
+        {
+            private readonly ViewCell _viewCell;
+            private readonly ICommand _tapCommand;
+
+            public ViewHolder(IntPtr javaReference, JniHandleOwnership transfer)
+                : base(javaReference, transfer)
+            {
+            }
+
+            public ViewHolder(View itemView, ViewCell viewCell, ICommand tapCommand)
+                : base(itemView)
+            {
+                _viewCell = viewCell;
+                _tapCommand = tapCommand;
+
+                if (_tapCommand != null)
+                {
+                    ItemView.Clickable = true;
+                    ItemView.Click += OnItemViewClick;
+                    AddRiple();
+                }
+            }
+
+            public ViewCell ViewCell => _viewCell;
+
+            public object BindingContext => ViewCell?.BindingContext;
+
+            public void Bind(object context, CollectionView parent)
+            {
+                _viewCell.BindingContext = context;
+                _viewCell.Parent = parent;
+            }
+
+            private void OnItemViewClick(object sender, EventArgs e)
+            {
+                if (_tapCommand.CanExecute(null))
+                {
+                    _tapCommand.Execute(BindingContext);
+                }
+            }
+
+            private void AddRiple()
+            {
+                var outValue = new TypedValue();
+                var context = ItemView.Context;
+                context.Theme.ResolveAttribute(Android.Resource.Attribute.SelectableItemBackground, outValue, true);
+                ItemView.SetBackgroundResource(outValue.ResourceId);
+            }
+        }
+
+        private class EmptyViewHolder : RecyclerView.ViewHolder
+        {
+            public EmptyViewHolder(IntPtr javaReference, JniHandleOwnership transfer)
+                : base(javaReference, transfer)
+            {
+            }
+
+            public EmptyViewHolder(Context context)
+                : base(new View(context))
+            {
+            }
+        }
+
+        private class RecycleViewAdapter : RecyclerView.Adapter
+        {
+            private const string Tag = "Adapter";
+
+            private readonly Context _context;
+            private readonly CollectionView _element;
+            private readonly WeakReference<RecyclerView> _weakParentView;
+            private readonly WeakReference<CollectionViewRenderer> _weakNativeView;
+            private readonly IEnumerable _elementItemsSource;
+            private readonly INotifyCollectionChanged _notifyCollectionChanged;
+            private readonly List<object> _dataSource;
+
+            private readonly ViewHolderQueue _viewHolderQueue;
+
+            private readonly List<DataTemplate> _dataTemplates = new List<DataTemplate>(3);
+            private readonly Dictionary<int, double> _sizeByType = new Dictionary<int, double>();
+
+            private readonly List<WeakReference<ViewCell>> _formsViews;
+
+            private CancellationTokenSource _enableDragAndDropCts;
+
+            private bool _collectionChangedBackfire;
+
+            private bool _isDisposed;
+
+            private int _currentMaxPosition = -1;
+
+            private IMauiContext _mauiContext;
+
+            public RecycleViewAdapter(IntPtr javaReference, JniHandleOwnership transfer)
+                : base(javaReference, transfer)
+            {
+            }
+
+            public RecycleViewAdapter(
+                CollectionView element,
+                CollectionViewRenderer nativeView,
+                RecyclerView parentView,
+                Context context,
+                IMauiContext mauiContext
+            )
+            {
+                _element = element;
+                _weakNativeView = new WeakReference<CollectionViewRenderer>(nativeView);
+                _weakParentView = new WeakReference<RecyclerView>(parentView);
+                _context = context;
+                _mauiContext = mauiContext;
+
+                _elementItemsSource = element.ItemsSource;
+
+                _dataSource = _elementItemsSource?.Cast<object>().ToList() ?? new List<object>();
+
+                _formsViews = new List<WeakReference<ViewCell>>();
+
+                if (_element.ItemTemplate is not DataTemplateSelector)
+                {
+                    // Cache only support single DataTemplate
+                    _viewHolderQueue = new ViewHolderQueue(element.ViewCacheSize, () => CreateViewHolder());
+                    _viewHolderQueue.Build();
+                }
+
+                _notifyCollectionChanged = _elementItemsSource as INotifyCollectionChanged;
+                if (_notifyCollectionChanged != null)
+                {
+                    _notifyCollectionChanged.CollectionChanged += OnCollectionChanged;
+                }
+            }
+
+            public override int ItemCount => _isDisposed || _dataSource == null ? 0 : _dataSource.Count;
+
+            public override long GetItemId(int position)
+            {
+                return position;
+            }
+
+
+            public override int GetItemViewType(int position)
+            {
+                if (_isDisposed)
+                {
+                    return -1;
+                }
+
+                if (_element.ItemTemplate is DataTemplateSelector dataTemplateSelector)
+                {
+                    var data = _dataSource[position];
+                    var dataTemplate = dataTemplateSelector.SelectTemplate(data, _element);
+
+                    int itemViewType = _dataTemplates.IndexOf(dataTemplate);
+                    if (itemViewType == -1)
+                    {
+                        itemViewType = _dataTemplates.Count;
+                        _dataTemplates.Add(dataTemplate);
+                    }
+
+                    if (!_element.IsLayoutLinear)
+                    {
+                        return itemViewType;
+                    }
+
+                    if (dataTemplate is SizedDataTemplate sizedDataTemplate)
+                    {
+                        _sizeByType[itemViewType] = sizedDataTemplate.Size;
+                    }
+                    else if (dataTemplateSelector is SizedDataTemplateSelector sizedDataTemplateSelector)
+                    {
+                        _sizeByType[itemViewType] = _element.IsLayoutHorizontal
+                            ? sizedDataTemplateSelector.GetItemSize(data, _element.ItemWidth)
+                            : sizedDataTemplateSelector.GetItemSize(data, _element.ItemHeight);
+                    }
+
+                    return itemViewType;
+                }
+
+                return base.GetItemViewType(position);
+            }
+
+            public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int position)
+            {
+                if (_isDisposed)
+                {
+                    return;
+                }
+
+                InternalLogger.Debug(Tag, () => $"OnBindViewHolder( position: {position} )");
+
+                var item = (ViewHolder)holder;
+                item.Bind(_dataSource[position], _element);
+
+                if (position > _currentMaxPosition)
+                {
+                    _currentMaxPosition = position;
+                    AnimateCell(item.ViewCell);
+                }
+            }
+
+            public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int viewType)
+            {
+                if (_isDisposed)
+                {
+                    return new EmptyViewHolder(_context);
+                }
+
+                if (_element.ItemTemplate is DataTemplateSelector)
+                {
+                    return CreateViewHolder(viewType);
+                }
+
+                return _viewHolderQueue.Dequeue();
+            }
+
+            public void OnEnableDragAndDropUpdated(bool isEnabled)
+            {
+                _enableDragAndDropCts?.Cancel();
+                _enableDragAndDropCts = new CancellationTokenSource();
+
+                if (!isEnabled)
+                {
+                    return;
+                }
+
+                foreach (var weakFormsView in _formsViews)
+                {
+                    if (!weakFormsView.TryGetTarget(out var formsView))
+                    {
+                        continue;
+                    }
+
+                    HandleDragAndDropEnabledAnimation(formsView);
+                }
+            }
+
+            public void OnItemMovedFromDragAndDrop(int from, int to)
+            {
+                if (_elementItemsSource is IList collection)
+                {
+                    try
+                    {
+                        _collectionChangedBackfire = true;
+
+                        var item = collection[from];
+                        collection.RemoveAt(from);
+                        collection.Insert(to, item);
+                    }
+                    finally
+                    {
+                        _collectionChangedBackfire = false;
+                    }
+                }
+            }
+
+            public void OnItemMoving(int from, int to)
+            {
+                MainThread.BeginInvokeOnMainThread(
+                    () =>
+                        {
+                            if (_isDisposed)
+                            {
+                                return;
+                            }
+
+                            if (from < to)
+                            {
+                                for (int i = from; i < to; i++)
+                                {
+                                    _dataSource.Swap(i, i + 1);
+                                }
+                            }
+                            else
+                            {
+                                for (int i = from; i > to; i--)
+                                {
+                                    _dataSource.Swap(i, i - 1);
+                                }
+                            }
+
+                            NotifyItemMoved(from, to);
+                        });
+            }
+
+            protected override void Dispose(bool disposing)
+            {
+                _isDisposed = true;
+                _viewHolderQueue?.Clear();
+
+                if (_notifyCollectionChanged != null)
+                {
+                    _notifyCollectionChanged.CollectionChanged -= OnCollectionChanged;
+                }
+
+                base.Dispose(disposing);
+            }
+
+            private ViewHolder CreateViewHolder(int itemViewType = -1)
+            {
+                var view = CreateView(out var viewCell, itemViewType);
+                var viewHolder = new ViewHolder(view, viewCell, _element.TapCommand);
+                if (_element.DragAndDropTrigger == DragAndDropTrigger.Pan)
+                {
+                    viewHolder.ItemView.Touch += (sender, e) => OnItemViewTouch(e, viewHolder);
+                }
+
+                return viewHolder;
+            }
+
+            private void OnItemViewTouch(TouchEventArgs e, ViewHolder item)
+            {
+                if (e.Event.ActionMasked == MotionEventActions.Down && _element.EnableDragAndDrop)
+                {
+                    if (!_weakNativeView.TryGetTarget(out CollectionViewRenderer nativeView))
+                    {
+                        return;
+                    }
+
+                    nativeView.StartDragging(item);
+                }
+
+                e.Handled = false;
+            }
+
+            private void HandleDragAndDropEnabledAnimation(ViewCell viewCell)
+            {
+                if (_enableDragAndDropCts != null
+                    && !_enableDragAndDropCts.IsCancellationRequested
+                    && _element.EnableDragAndDrop
+                    && _element.DragAndDropEnabledAnimationAsync != null)
+                {
+                    InternalLogger.Debug("HandleDragAndDropEnabledAnimation");
+
+                    TaskMonitor.Create(_element.DragAndDropEnabledAnimationAsync(viewCell, _enableDragAndDropCts.Token));
+                }
+            }
+
+            private void AnimateCell(ViewCell cell)
+            {
+                TaskMonitor.Create(
+                    async () =>
+                    {
+                        if (_element.PreRevealAnimationAsync != null)
+                        {
+                            await _element.PreRevealAnimationAsync(cell);
+                        }
+
+                        if (_element.RevealAnimationAsync != null)
+                        {
+                            await _element.RevealAnimationAsync(cell);
+                        }
+
+                        if (_element.PostRevealAnimationAsync != null)
+                        {
+                            await _element.PostRevealAnimationAsync(cell);
+                        }
+                    });
+            }
+
+            private View CreateView(out ViewCell viewCell, int itemViewType)
+            {
+                InternalLogger.Debug("Creating View");
+                var dataTemplate = _element.ItemTemplate;
+
+                if (itemViewType == -1)
+                {
+                    viewCell = (ViewCell)dataTemplate.CreateContent();
+                }
+                else
+                {
+                    var template = _dataTemplates[itemViewType];
+                    if (template is SizedDataTemplate sizedDataTemplate)
+                    {
+                        template = sizedDataTemplate.DataTemplate;
+                    }
+
+                    viewCell = (ViewCell)template.CreateContent();
+                }
+
+                double itemWidth = _element.ItemWidth;
+                double itemHeight = _element.ItemHeight;
+
+                if (_element.IsLayoutLinear
+                    && _sizeByType.TryGetValue(itemViewType, out double itemSize))
+                {
+                    if (_element.IsLayoutHorizontal)
+                    {
+                        itemWidth = itemSize;
+                    }
+                    else
+                    {
+                        itemHeight = itemSize;
+                    }
+                }
+
+                _formsViews.Add(new WeakReference<ViewCell>(viewCell));
+                var view = viewCell.View;
+
+
+                var renderer = Platform.CreateRendererWithContext(view, _context);
+                Platform.SetRenderer(view, renderer);
+                renderer.Element.Layout(new Rect(0, 0, itemWidth, itemHeight));
+                renderer.UpdateLayout();
+
+                var itemView = renderer.View;
+
+                int topMargin = _element.IsLayoutHorizontal
+                    ? 0
+                    : PlatformHelper.Instance.DpToPixels(MeasureHelper.RecyclerViewItemVerticalMarginDp);
+
+                int bottomMargin = _element.IsLayoutHorizontal
+                    ? 0
+                    : PlatformHelper.Instance.DpToPixels(MeasureHelper.RecyclerViewItemVerticalMarginDp);
+
+                int width = PlatformHelper.Instance.DpToPixels(itemWidth, PlatformHelper.Rounding.Floor);
+                int height = PlatformHelper.Instance.DpToPixels(itemHeight);
+
+                itemView.LayoutParameters = new FrameLayout.LayoutParams(width, height)
+                {
+                    Gravity = GravityFlags.CenterHorizontal,
+                    TopMargin = topMargin,
+                    BottomMargin = bottomMargin,
+                };
+
+                HandleDragAndDropEnabledAnimation(viewCell);
+
+                if (_element.IsLayoutLinear)
+                {
+                    return itemView;
+                }
+
+                // If it's a grid list layer, we need to add it in a parent's view to have it centered
+                var container = new FrameLayout(_context)
+                {
+                    LayoutParameters = new FrameLayout.LayoutParams(
+                        LayoutParams.MatchParent,
+                        height + topMargin + bottomMargin),
+                };
+
+                container.AddView(itemView);
+
+                return container;
+            }
+
+            private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+            {
+                if (_isDisposed || _collectionChangedBackfire)
+                {
+                    return;
+                }
+
+                if (!_weakParentView.TryGetTarget(out var parentView) || parentView.IsNullOrDisposed())
+                {
+                    Dispose();
+                    return;
+                }
+
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        OnItemAdded(e.NewStartingIndex, e.NewItems);
+                        parentView.InvalidateItemDecorations();
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        OnItemRemoved(e.OldStartingIndex, e.OldItems.Count);
+                        parentView.InvalidateItemDecorations();
+                        break;
+
+                    case NotifyCollectionChangedAction.Move:
+                        OnItemMoved(e.OldStartingIndex, e.NewStartingIndex);
+                        parentView.InvalidateItemDecorations();
+                        break;
+
+                    case NotifyCollectionChangedAction.Replace:
+                        OnItemReplaced(e.NewStartingIndex, e.NewItems[0]);
+                        parentView.InvalidateItemDecorations();
+                        break;
+
+                    case NotifyCollectionChangedAction.Reset:
+                        // Handled in the CollectionViewRenderer class, will just create a new adapter
+                        break;
+                }
+            }
+
+            private void OnItemReplaced(int itemIndex, object newItem)
+            {
+                InternalLogger.Info($"OnItemReplaced( itemIndex: {itemIndex} )");
+                MainThread.BeginInvokeOnMainThread(
+                    () =>
+                    {
+                        if (_isDisposed)
+                        {
+                            return;
+                        }
+
+                        _dataSource[itemIndex] = newItem;
+
+                        NotifyItemChanged(itemIndex);
+                    });
+            }
+
+            private void OnItemMoved(int from, int to)
+            {
+                InternalLogger.Info($"OnItemMoved( from: {from}, to: {to} )");
+                MainThread.BeginInvokeOnMainThread(
+                    () =>
+                    {
+                        if (_isDisposed)
+                        {
+                            return;
+                        }
+
+                        var item = _dataSource[from];
+                        _dataSource.RemoveAt(from);
+                        _dataSource.Insert(to, item);
+
+                        NotifyItemMoved(from, to);
+                    });
+            }
+
+            private void OnItemAdded(int newIndex, IList items)
+            {
+                InternalLogger.Info($"OnItemAdded( newIndex: {newIndex}, itemCount: {items.Count} )");
+                MainThread.BeginInvokeOnMainThread(
+                    () =>
+                    {
+                        if (_isDisposed)
+                        {
+                            return;
+                        }
+
+                        _dataSource.InsertRange(newIndex, items.Cast<object>());
+                        if (items.Count == 1)
+                        {
+                            NotifyItemInserted(newIndex);
+                        }
+                        else
+                        {
+                            NotifyItemRangeInserted(newIndex, items.Count);
+                        }
+                    });
+            }
+
+            private void OnItemRemoved(int removedIndex, int itemCount)
+            {
+                InternalLogger.Info($"OnItemRemoved( newIndex: {removedIndex}, itemCount: {itemCount} )");
+                MainThread.BeginInvokeOnMainThread(
+                    () =>
+                    {
+                        if (_isDisposed)
+                        {
+                            return;
+                        }
+
+                        for (int index = removedIndex; index < removedIndex + itemCount; index++)
+                        {
+                            var data = _dataSource[index];
+                            Unbind(data);
+                        }
+
+                        _dataSource.RemoveRange(removedIndex, itemCount);
+                        if (itemCount == 1)
+                        {
+                            NotifyItemRemoved(removedIndex);
+                        }
+                        else
+                        {
+                            NotifyItemRangeRemoved(removedIndex, itemCount);
+                        }
+                    });
+            }
+
+            private void Unbind(object data)
+            {
+                // System.Diagnostics.Debug.WriteLine($"Unbind( data: {data} )");
+                var weakViewCell = _formsViews.FirstOrDefault(
+                    weakView => weakView.TryGetTarget(out ViewCell cell) && cell.BindingContext == data);
+
+                if (weakViewCell == null)
+                {
+                    return;
+                }
+
+                if (weakViewCell.TryGetTarget(out var viewCell))
+                {
+                    viewCell.BindingContext = null;
+                    viewCell.Parent = null;
+                }
+            }
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.cs
new file mode 100644
index 0000000..c106c18
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CollectionViewRenderer.cs
@@ -0,0 +1,469 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Android.Content;
+using Android.Views;
+using AndroidX.RecyclerView.Widget;
+
+#if NET6_0_OR_GREATER
+using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.Controls.Platform;
+#endif
+
+using Sharpnado.CollectionView;
+using Sharpnado.CollectionView.Droid.Helpers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+using CollectionView = Sharpnado.CollectionView.CollectionView;
+using GridLayoutManager = AndroidX.RecyclerView.Widget.GridLayoutManager;
+
+#if !NET6_0_OR_GREATER
+[assembly: ExportRenderer(typeof(CollectionView), typeof(CollectionViewRenderer))]
+#endif
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+#if !NET6_0_OR_GREATER
+    [Xamarin.Forms.Internals.Preserve]
+#endif
+    public partial class CollectionViewRenderer : ViewRenderer<CollectionView, RecyclerView>
+    {
+        private bool _isCurrentIndexUpdateBackfire;
+        private bool _isLandscape;
+        private bool _isFirstInitialization = true;
+
+        private bool _forceLayout = false;
+        private IEnumerable _itemsSource;
+        private ItemTouchHelper _dragHelper;
+        private SpaceItemDecoration _itemDecoration;
+
+        public CollectionViewRenderer(Context context)
+            : base(context)
+        {
+        }
+
+        public CustomLinearLayoutManager HorizontalLinearLayoutManager => Control?.GetLayoutManager() as CustomLinearLayoutManager;
+
+        public GridLayoutManager GridLayoutManager => Control?.GetLayoutManager() as GridLayoutManager;
+
+        public LinearLayoutManager LinearLayoutManager => Control?.GetLayoutManager() as LinearLayoutManager;
+
+        public bool IsScrolling { get; set; }
+
+        public bool IsSnapHelperBusy { get; set; }
+
+        public int CurrentSnapIndex { get; set; }
+
+        public static void Initialize()
+        {
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CollectionView> e)
+        {
+            base.OnElementChanged(e);
+
+            if (e.OldElement != null)
+            {
+                if (_dragHelper != null)
+                {
+                    _dragHelper.AttachToRecyclerView(null);
+                    _dragHelper = null;
+                }
+
+                if (!Control.IsNullOrDisposed())
+                {
+                    Control.ClearOnScrollListeners();
+                    var treeViewObserver = Control.ViewTreeObserver;
+                    if (treeViewObserver != null)
+                    {
+                        treeViewObserver.PreDraw -= OnPreDraw;
+                    }
+
+                    Control.GetAdapter()?.Dispose();
+                    Control.GetLayoutManager()?.Dispose();
+                }
+
+                if (_itemsSource is INotifyCollectionChanged oldNotifyCollection)
+                {
+                    oldNotifyCollection.CollectionChanged -= OnCollectionChanged;
+                }
+            }
+
+            if (e.NewElement != null)
+            {
+                CreateView(e.NewElement);
+            }
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(CollectionView.ItemsSource):
+                    UpdateItemsSource();
+                    break;
+                case nameof(CollectionView.CurrentIndex) when !_isCurrentIndexUpdateBackfire:
+                    ScrollToCurrentItem();
+                    break;
+                case nameof(CollectionView.DisableScroll):
+                    ProcessDisableScroll();
+                    break;
+                case nameof(CollectionView.ColumnCount):
+                case nameof(CollectionView.CollectionLayout):
+                    UpdateListLayout();
+                    break;
+                case nameof(CollectionView.EnableDragAndDrop):
+                    UpdateEnableDragAndDrop();
+                    break;
+            }
+        }
+
+        protected override void OnAttachedToWindow()
+        {
+            base.OnAttachedToWindow();
+        }
+
+        protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
+        {
+            if ((!changed && !_forceLayout)
+                || Control == null
+                || Element == null
+                || (Element.ColumnCount == 0
+                    && (Element.IsLayoutHorizontal && Element.ItemHeight > 0)))
+            {
+                base.OnLayout(changed, left, top, right, bottom);
+                return;
+            }
+
+            int width = right - left;
+            int height = bottom - top;
+
+            base.OnLayout(changed, left, top, right, bottom);
+
+            if (ComputeItemSize(width, height))
+            {
+                UpdateItemsSource();
+            }
+
+            // Initially was here
+            // base.OnLayout(changed, left, top, right, bottom);
+
+            _forceLayout = false;
+        }
+
+        private bool ComputeItemSize(int width, int height)
+        {
+            if (Control == null
+                || Element == null
+                || (Element.ColumnCount == 0
+                    && (Element.IsLayoutHorizontal && Element.ItemHeight > 0)))
+            {
+                return false;
+            }
+
+            bool widthChanged = false;
+            bool heightChanged = false;
+            if (Element.ColumnCount > 0)
+            {
+                double newItemWidth = Element.ComputeItemWidth(width);
+                if (Element.ItemWidth != newItemWidth)
+                {
+                    Element.ItemWidth = newItemWidth;
+                    widthChanged = true;
+                }
+
+                if (Element.CollectionLayout == CollectionViewLayout.Grid || Element.CollectionLayout == CollectionViewLayout.Vertical)
+                {
+                    if (Control.GetLayoutManager() is ResponsiveGridLayoutManager layoutManager)
+                    {
+                        layoutManager.ResetSpan();
+                        Control.InvalidateItemDecorations();
+                    }
+                }
+            }
+
+            if (Element.IsLayoutHorizontal && Element.ItemHeight == 0)
+            {
+                double newItemHeight = Element.ComputeItemHeight(height);
+                if (Element.ItemHeight != newItemHeight)
+                {
+                    Element.ItemHeight = newItemHeight;
+                    heightChanged = true;
+                }
+            }
+
+            return widthChanged || heightChanged;
+        }
+
+        private void CreateView(CollectionView collection)
+        {
+            if (_isFirstInitialization)
+            {
+                Element.CheckConsistency();
+                _isFirstInitialization = false;
+            }
+
+            var recyclerView = new SlowRecyclerView(Context, Element.ScrollSpeed) { HasFixedSize = false };
+
+            SetListLayout(recyclerView);
+
+            SetNativeControl(recyclerView);
+
+            if (Element.SnapStyle != SnapStyle.None)
+            {
+                LinearSnapHelper snapHelper = Element.SnapStyle == SnapStyle.Start
+                    ? new StartSnapHelper(this)
+                    : new CenterSnapHelper(this);
+                snapHelper.AttachToRecyclerView(Control);
+            }
+
+            Control.HorizontalScrollBarEnabled = false;
+
+            if (Element.ItemsSource != null)
+            {
+                UpdateItemsSource();
+            }
+
+            if (LinearLayoutManager != null)
+            {
+                Control.AddOnScrollListener(new OnControlScrollChangedListener(this, collection));
+
+                ProcessDisableScroll();
+
+                if (HorizontalLinearLayoutManager != null)
+                {
+                    ScrollToCurrentItem();
+                }
+            }
+
+            Control.ViewTreeObserver.PreDraw += OnPreDraw;
+        }
+
+        private void SetListLayout(RecyclerView recyclerView)
+        {
+            if (Element.CollectionLayout == CollectionViewLayout.Grid || Element.CollectionLayout == CollectionViewLayout.Vertical)
+            {
+                recyclerView.SetLayoutManager(new ResponsiveGridLayoutManager(Context, Element));
+            }
+            else
+            {
+                recyclerView.SetLayoutManager(new CustomLinearLayoutManager(Context, OrientationHelper.Horizontal, false));
+            }
+
+            if (Element.ItemSpacing > 0 || Element.CollectionPadding != new Thickness(0))
+            {
+                if (!_itemDecoration.IsNullOrDisposed())
+                {
+                    recyclerView.RemoveItemDecoration(_itemDecoration);
+                    _itemDecoration = null;
+                }
+
+                _itemDecoration = new SpaceItemDecoration(Element.ItemSpacing);
+                recyclerView.AddItemDecoration(_itemDecoration);
+                recyclerView.SetPadding(
+                    PlatformHelper.Instance.DpToPixels(Element.CollectionPadding.Left),
+                    PlatformHelper.Instance.DpToPixels(Element.CollectionPadding.Top),
+                    PlatformHelper.Instance.DpToPixels(Element.CollectionPadding.Right),
+                    PlatformHelper.Instance.DpToPixels(Element.CollectionPadding.Bottom));
+
+                recyclerView.SetClipToPadding(false);
+                recyclerView.SetClipChildren(false);
+            }
+        }
+
+        private void OnPreDraw(object sender, ViewTreeObserver.PreDrawEventArgs e)
+        {
+            if (Control.IsNullOrDisposed())
+            {
+                return;
+            }
+
+            bool orientationChanged = false;
+            if (Control.Height < Control.Width)
+            {
+                if (!_isLandscape)
+                {
+                    orientationChanged = true;
+                    _isLandscape = true;
+
+                    // Has just rotated
+                    if (HorizontalLinearLayoutManager != null)
+                    {
+                        ScrollToCurrentItem();
+                    }
+                }
+            }
+            else
+            {
+                orientationChanged = _isLandscape;
+                _isLandscape = false;
+            }
+
+            if (orientationChanged)
+            {
+                if (Control.GetLayoutManager() is ResponsiveGridLayoutManager layoutManager)
+                {
+                    layoutManager.ResetSpan();
+                }
+
+                Control.InvalidateItemDecorations();
+            }
+        }
+
+        private void ProcessDisableScroll()
+        {
+            if (Control.IsNullOrDisposed())
+            {
+                return;
+            }
+
+            if (LinearLayoutManager == null)
+            {
+                return;
+            }
+
+            if (HorizontalLinearLayoutManager != null)
+            {
+                HorizontalLinearLayoutManager.CanScroll = !Element.DisableScroll;
+            }
+            else if (GridLayoutManager != null
+                && GridLayoutManager is ResponsiveGridLayoutManager responsiveGridLayoutManager)
+            {
+                responsiveGridLayoutManager.CanScroll = !Element.DisableScroll;
+            }
+        }
+
+        private void ScrollToCurrentItem()
+        {
+            if (Control.IsNullOrDisposed())
+            {
+                return;
+            }
+
+            if (Element.CurrentIndex == -1 || Control.GetAdapter() == null || Element.CurrentIndex >= Control.GetAdapter().ItemCount)
+            {
+                return;
+            }
+
+            InternalLogger.Info($"ScrollToCurrentItem() => CurrentItem: {Element.CurrentIndex}");
+
+            int offset = 0;
+            if (HorizontalLinearLayoutManager != null)
+            {
+                int itemWidth = PlatformHelper.Instance.DpToPixels(
+                    Element.ItemWidth
+                    + Element.ItemSpacing
+                    + Element.CollectionPadding.HorizontalThickness);
+
+                int width = Control.MeasuredWidth;
+
+                switch (Element.SnapStyle)
+                {
+                    case SnapStyle.Center:
+                        offset = (width / 2) - (itemWidth / 2);
+                        break;
+                }
+            }
+
+            LinearLayoutManager?.ScrollToPositionWithOffset(Element.CurrentIndex, offset);
+            GridLayoutManager?.ScrollToPositionWithOffset(Element.CurrentIndex, offset);
+        }
+
+        private void UpdateEnableDragAndDrop()
+        {
+            if (Control.IsNullOrDisposed() || Control.GetAdapter().IsNullOrDisposed())
+            {
+                return;
+            }
+
+            _dragHelper?.AttachToRecyclerView(null);
+
+            if (Element.EnableDragAndDrop)
+            {
+                _dragHelper = new ItemTouchHelper(
+                    new DragAnDropItemTouchHelperCallback(
+                        Element,
+                        (RecycleViewAdapter)Control.GetAdapter(),
+                        Element.DragAndDropStartedCommand,
+                        Element.DragAndDropEndedCommand));
+                _dragHelper.AttachToRecyclerView(Control);
+            }
+
+            var adapter = Control.GetAdapter();
+            ((RecycleViewAdapter)adapter)?.OnEnableDragAndDropUpdated(Element.EnableDragAndDrop);
+        }
+
+        private void UpdateItemsSource()
+        {
+            InternalLogger.Info($"UpdateItemsSource()");
+
+            if (Control.IsNullOrDisposed())
+            {
+                return;
+            }
+
+            var oldAdapter = Control.GetAdapter();
+
+            if (_itemsSource is INotifyCollectionChanged oldNotifyCollection)
+            {
+                oldNotifyCollection.CollectionChanged -= OnCollectionChanged;
+            }
+
+            _itemsSource = Element.ItemsSource;
+
+            var mauiContext = Element.Handler?.MauiContext;
+            if (mauiContext == null)
+            {
+                InternalLogger.Error($"Element handler is null: cannot return maui context");
+                return;
+            }
+
+            Control.GetRecycledViewPool().Clear();
+            var adapter = new RecycleViewAdapter(Element, this, Control, Context, mauiContext);
+            Control.SetAdapter(adapter);
+
+            if (!oldAdapter.IsNullOrDisposed())
+            {
+                oldAdapter.Dispose();
+            }
+
+            if (_itemsSource is INotifyCollectionChanged newNotifyCollection)
+            {
+                newNotifyCollection.CollectionChanged += OnCollectionChanged;
+            }
+
+            UpdateEnableDragAndDrop();
+
+            ScrollToCurrentItem();
+        }
+
+        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                UpdateItemsSource();
+            }
+        }
+
+        private void UpdateListLayout()
+        {
+            if (Control.IsNullOrDisposed())
+            {
+                return;
+            }
+
+            _forceLayout = true;
+
+            SetListLayout(Control);
+            UpdateItemsSource();
+            ProcessDisableScroll();
+            ScrollToCurrentItem();
+        }
+
+        private void StartDragging(RecyclerView.ViewHolder viewHolder)
+        {
+            _dragHelper.StartDrag(viewHolder);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CustomLinearLayoutManager.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CustomLinearLayoutManager.cs
new file mode 100644
index 0000000..b7e90f0
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/CustomLinearLayoutManager.cs
@@ -0,0 +1,40 @@
+using System;
+
+using Android.Content;
+using Android.Runtime;
+
+using AndroidX.RecyclerView.Widget;
+
+#if __ANDROID_29__
+
+#else
+using Android.Support.V7.Widget;
+#endif
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class CustomLinearLayoutManager : LinearLayoutManager
+    {
+        public CustomLinearLayoutManager(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(
+            javaReference,
+            transfer)
+        {
+        }
+
+        public CustomLinearLayoutManager(Context context, int orientation, bool reverseLayout)
+            : base(
+            context,
+            orientation,
+            reverseLayout)
+        {
+        }
+
+        public bool CanScroll { get; set; }
+
+        public override bool CanScrollHorizontally()
+        {
+            return CanScroll && base.CanScrollHorizontally();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/MeasureHelper.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/MeasureHelper.cs
new file mode 100644
index 0000000..8cbbcc9
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/MeasureHelper.cs
@@ -0,0 +1,43 @@
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public static class MeasureHelper
+    {
+        public static int RecyclerViewItemVerticalMarginDp = 0; // Initially was 2
+
+        public static int ComputeSpan(int availableWidth, CollectionView element)
+        {
+            int itemSpace = PlatformHelper.Instance.DpToPixels(element.ItemSpacing);
+            int leftPadding = PlatformHelper.Instance.DpToPixels(element.CollectionPadding.Left);
+            int rightPadding = PlatformHelper.Instance.DpToPixels(element.CollectionPadding.Right);
+
+            if (element.ItemWidth == 0)
+            {
+                element.ItemWidth = element.ComputeItemWidth(availableWidth);
+            }
+
+            int itemWidth = PlatformHelper.Instance.DpToPixels(element.ItemWidth, PlatformHelper.Rounding.Floor);
+
+            int columnCount = 0;
+            while (true)
+            {
+                columnCount++;
+                int interPadding = itemSpace * (columnCount - 1);
+                int totalWidth = itemWidth * columnCount + interPadding + leftPadding + rightPadding;
+
+                if (totalWidth > availableWidth)
+                {
+                    break;
+                }
+            }
+
+            if (--columnCount == 0)
+            {
+                InternalLogger.Error(
+                    "The CollectionPadding, ItemSpacing and ItemWidth specified doesn't allow a single column to be displayed");
+                return 1;
+            }
+
+            return columnCount;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ResponsiveGridLayoutManager.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ResponsiveGridLayoutManager.cs
new file mode 100644
index 0000000..b1dd8cb
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ResponsiveGridLayoutManager.cs
@@ -0,0 +1,167 @@
+#if __ANDROID_29__
+using AndroidX.RecyclerView.Widget;
+#else
+using Android.Support.V7.Widget;
+#endif
+using System;
+
+using Android.Content;
+using Android.Graphics;
+using Android.Runtime;
+
+using Rect = Android.Graphics.Rect;
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class SpaceItemDecoration : RecyclerView.ItemDecoration
+    {
+        private readonly int _space;
+
+        private readonly int _verticalMargin;
+
+        public SpaceItemDecoration(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(javaReference, transfer)
+        {
+        }
+
+        public SpaceItemDecoration(int spaceDp)
+        {
+            _space = PlatformHelper.Instance.DpToPixels(spaceDp);
+            _verticalMargin = PlatformHelper.Instance.DpToPixels(MeasureHelper.RecyclerViewItemVerticalMarginDp);
+        }
+
+        public override void GetItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state)
+        {
+            int viewPosition = parent.GetChildAdapterPosition(view);
+            int viewCount = parent.GetAdapter().ItemCount;
+
+            switch (parent.GetLayoutManager())
+            {
+                case ResponsiveGridLayoutManager responsiveGridLayout:
+                    int adaptedSpace = (int)((_space - _verticalMargin * 2) * 0.66);
+                    int top = adaptedSpace / 2;
+                    int bottom = adaptedSpace / 2;
+                    int spanCount = responsiveGridLayout.SpanCount;
+
+                    bool isViewEdgeTop = viewPosition < spanCount;
+                    if (isViewEdgeTop)
+                    {
+                        top = 0;
+                    }
+
+                    bool isViewEdgeBottom = viewPosition / spanCount == viewCount - 1 / spanCount;
+                    if (isViewEdgeBottom)
+                    {
+                        bottom = 0;
+                    }
+
+                    outRect.Set(0, top, 0, bottom);
+                    return;
+
+                case LinearLayoutManager linearLayout:
+                    int right = _space / 2;
+                    int left = _space / 2;
+                    bool isViewEdgeLeft = viewPosition == 0;
+                    bool isViewEdgeRight = viewPosition == viewCount - 1;
+
+                    if (isViewEdgeLeft)
+                    {
+                        left = 0;
+                    }
+
+                    if (isViewEdgeRight)
+                    {
+                        right = 0;
+                    }
+
+                    outRect.Set(left, 0, right, 0);
+                    return;
+            }
+
+            base.GetItemOffsets(outRect, view, parent, state);
+
+            // InternalLogger.Info(
+            //    $"view n°{viewPosition + 1} => left: {left}, right: {right}");
+        }
+    }
+
+    public class ResponsiveGridLayoutManager : GridLayoutManager
+    {
+        private readonly Context _context;
+        private readonly WeakReference<CollectionView> _weakElement;
+
+        private bool _spanNeedsCompute;
+
+        public ResponsiveGridLayoutManager(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(javaReference, transfer)
+        {
+        }
+
+        public ResponsiveGridLayoutManager(Context context, CollectionView element)
+            : base(context, 1)
+        {
+            _context = context;
+            _weakElement = new WeakReference<CollectionView>(element);
+            _spanNeedsCompute = true;
+        }
+
+        public bool CanScroll { get; set; }
+
+        public bool TryGetItemWidth(out int itemWidth)
+        {
+            itemWidth = 0;
+            if (_weakElement.TryGetTarget(out var element))
+            {
+                itemWidth = PlatformHelper.Instance.DpToPixels(element.ItemWidth);
+            }
+
+            return itemWidth > 0;
+        }
+
+        public bool IsAutoComputedItemWidth()
+        {
+            if (_weakElement.TryGetTarget(out var element))
+            {
+                return element.ColumnCount > 0;
+            }
+
+            return false;
+        }
+
+        public void ResetSpan()
+        {
+            _spanNeedsCompute = true;
+        }
+
+        public override void OnLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state)
+        {
+            if (Width > 0 && _spanNeedsCompute)
+            {
+                ComputeSpanCount(Width);
+            }
+
+            base.OnLayoutChildren(recycler, state);
+        }
+
+        public override bool CanScrollHorizontally()
+        {
+            return CanScroll && base.CanScrollHorizontally();
+        }
+
+        public override bool CanScrollVertically()
+        {
+            return CanScroll && base.CanScrollVertically();
+        }
+
+        private void ComputeSpanCount(int recyclerWidth)
+        {
+            if (_weakElement.TryGetTarget(out var element))
+            {
+                SpanCount = MeasureHelper.ComputeSpan(recyclerWidth, element);
+            }
+
+            _spanNeedsCompute = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/SlowRecyclerView.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/SlowRecyclerView.cs
new file mode 100644
index 0000000..f3f1f06
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/SlowRecyclerView.cs
@@ -0,0 +1,47 @@
+using System;
+
+using Android.Content;
+using Android.Runtime;
+
+using AndroidX.RecyclerView.Widget;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class SlowRecyclerView : RecyclerView
+    {
+        private readonly ScrollSpeed _scrollSpeed;
+
+        private readonly double _percent = 1;
+
+        public SlowRecyclerView(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(javaReference, transfer)
+        {
+        }
+
+        public SlowRecyclerView(Context context, ScrollSpeed scrollSpeed)
+            : base(context)
+        {
+            _scrollSpeed = scrollSpeed;
+            switch (_scrollSpeed)
+            {
+                case ScrollSpeed.Normal:
+                    _percent = 1;
+                    break;
+                case ScrollSpeed.Slower:
+                    _percent = 0.5;
+                    break;
+                case ScrollSpeed.Slowest:
+                    _percent = 0.2;
+                    break;
+            }
+        }
+
+        public override bool Fling(int velocityX, int velocityY)
+        {
+            velocityX = (int)(velocityX * _percent);
+            velocityY = (int)(velocityY * _percent);
+
+            return base.Fling(velocityX, velocityY);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/StartSnapHelper.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/StartSnapHelper.cs
new file mode 100644
index 0000000..a824765
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/StartSnapHelper.cs
@@ -0,0 +1,123 @@
+using System;
+
+using Android.Runtime;
+using Android.Views;
+
+using AndroidX.RecyclerView.Widget;
+
+using View = Android.Views.View;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class StartSnapHelper : CenterSnapHelper
+    {
+        private OrientationHelper _verticalHelper;
+        private OrientationHelper _horizontalHelper;
+
+        public StartSnapHelper(CollectionViewRenderer nativeView)
+            : base(nativeView)
+        {
+        }
+
+        public StartSnapHelper(IntPtr javaReference, JniHandleOwnership transfer)
+            : base(javaReference, transfer)
+        {
+        }
+
+        public override int[] CalculateDistanceToFinalSnap(RecyclerView.LayoutManager layoutManager, View targetView)
+        {
+            int[] result = new int[2];
+
+            result[0] = layoutManager.CanScrollHorizontally()
+                ? DistanceToStart(targetView, GetHorizontalHelper(layoutManager))
+                : 0;
+
+            result[1] = layoutManager.CanScrollVertically()
+                ? DistanceToStart(targetView, GetVerticalHelper(layoutManager))
+                : 0;
+
+            InternalLogger.Info($"CalculateDistanceToFinalSnap()");
+            return result;
+        }
+
+        public override View FindSnapView(RecyclerView.LayoutManager layoutManager)
+        {
+            if (!(layoutManager is LinearLayoutManager))
+            {
+                return base.FindSnapView(layoutManager);
+            }
+
+            OrientationHelper helper = layoutManager.CanScrollHorizontally()
+                ? GetHorizontalHelper(layoutManager)
+                : GetVerticalHelper(layoutManager);
+
+            var startView = GetStartView(layoutManager, helper, out int viewPosition);
+
+            InternalLogger.Info($"FindSnapView ( viewPosition: {viewPosition} )");
+
+            ReleaseIsBusy(startView);
+
+            return startView;
+        }
+
+        private View GetStartView(
+            RecyclerView.LayoutManager layoutManager,
+            OrientationHelper helper,
+            out int viewPosition)
+        {
+            viewPosition = -1;
+            if (!(layoutManager is LinearLayoutManager manager))
+            {
+                return base.FindSnapView(layoutManager);
+            }
+
+            int firstChild = manager.FindFirstVisibleItemPosition();
+
+            bool isLastItem = manager.FindLastCompletelyVisibleItemPosition() == layoutManager.ItemCount - 1;
+
+            if (isLastItem)
+            {
+                if (WeakNativeView.TryGetTarget(out var target))
+                {
+                    target.CurrentSnapIndex = layoutManager.ItemCount - 1;
+
+                    // System.Diagnostics.Debug.WriteLine($">>>>>> CurrentSnapIndex: {target.CurrentSnapIndex}");
+                }
+
+                return null;
+            }
+
+            if (firstChild == RecyclerView.NoPosition)
+            {
+                return null;
+            }
+
+            View child = layoutManager.FindViewByPosition(firstChild);
+
+            if (helper.GetDecoratedEnd(child) >= helper.GetDecoratedMeasurement(child) / 2
+                && helper.GetDecoratedEnd(child) > 0)
+            {
+                viewPosition = firstChild;
+                return child;
+            }
+
+            viewPosition = firstChild + 1;
+            return layoutManager.FindViewByPosition(firstChild + 1);
+        }
+
+        private int DistanceToStart(View targetView, OrientationHelper helper)
+        {
+            return helper.GetDecoratedStart(targetView) - helper.StartAfterPadding;
+        }
+
+        private OrientationHelper GetVerticalHelper(RecyclerView.LayoutManager layoutManager)
+        {
+            return _verticalHelper ?? (_verticalHelper = OrientationHelper.CreateVerticalHelper(layoutManager));
+        }
+
+        private OrientationHelper GetHorizontalHelper(RecyclerView.LayoutManager layoutManager)
+        {
+            return _horizontalHelper ?? (_horizontalHelper = OrientationHelper.CreateHorizontalHelper(layoutManager));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ViewHolderQueue.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ViewHolderQueue.cs
new file mode 100644
index 0000000..dbef266
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/Android/Renderers/ViewHolderQueue.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using Android.Views;
+
+using AndroidX.RecyclerView.Widget;
+
+using Sharpnado.CollectionView.Droid.Helpers;
+using Sharpnado.Tasks;
+
+namespace Sharpnado.CollectionView.Droid.Renderers
+{
+    public class ViewHolderQueue
+    {
+        private readonly Func<RecyclerView.ViewHolder> _viewFactory;
+        private readonly Queue<JniWeakReference<RecyclerView.ViewHolder>> _views;
+        private readonly int _initialSize;
+
+        public ViewHolderQueue(int initialSize, Func<RecyclerView.ViewHolder> viewFactory)
+        {
+            _initialSize = initialSize;
+            _viewFactory = viewFactory;
+            _views = new Queue<JniWeakReference<RecyclerView.ViewHolder>>(initialSize);
+        }
+
+        public void Build()
+        {
+            TaskMonitor.Create(BuildViewsAsync);
+        }
+
+        public void Clear()
+        {
+            lock (_views)
+            {
+                foreach (var view in _views)
+                {
+                    if (view.TryGetTarget(out var holder))
+                    {
+                        if (holder.ItemView is ViewGroup viewGroup)
+                        {
+                            viewGroup.RemoveAllViews();
+                        }
+
+                        holder.ItemView?.Dispose();
+                    }
+                }
+
+                _views.Clear();
+            }
+        }
+
+        public RecyclerView.ViewHolder Dequeue()
+        {
+            lock (_views)
+            {
+                if (_views.Count > 0 && _views.Dequeue().TryGetTarget(out var result))
+                {
+                    return result;
+                }
+            }
+
+            return _viewFactory();
+        }
+
+        private Task BuildViewsAsync()
+        {
+            return Task.Run(
+                () =>
+                {
+                    for (int i = 0; i < _initialSize; i++)
+                    {
+                        var view = _viewFactory();
+                        lock (_views)
+                        {
+                            _views.Enqueue(new JniWeakReference<RecyclerView.ViewHolder>(view));
+                        }
+                    }
+                });
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/IdentifierFormatter.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/IdentifierFormatter.cs
new file mode 100644
index 0000000..225dd96
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/IdentifierFormatter.cs
@@ -0,0 +1,12 @@
+using Sharpnado.CollectionView.iOS.Renderers;
+
+namespace Sharpnado.CollectionView.iOS.Helpers
+{
+    public static class IdentifierFormatter
+    {
+        public static string FormatDataTemplateCellIdentifier(int index)
+        {
+            return string.Concat(nameof(iOSViewCell), index);
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/PlatformHelper.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/PlatformHelper.cs
new file mode 100644
index 0000000..3e9a22b
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/PlatformHelper.cs
@@ -0,0 +1,33 @@
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Helpers
+{
+    public class iOSPlatformHelper : PlatformHelper
+    {
+        public override int DpToPixels(int dp, Rounding rounding = Rounding.Round) => dp;
+
+        public override int DpToPixels(double dp, Rounding rounding = Rounding.Round) => (int)dp;
+
+        public override double PixelsToDp(double pixels) => pixels;
+
+        public override string DumpNativeViewHierarchy(View formsView, bool verbose)
+        {
+            if (formsView.Handler?.PlatformView is not UIView nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpHierarchy(verbose) ?? "null renderer";
+        }
+
+        public override string DumpNativeViewInfo(View formsView)
+        {
+            if (formsView.Handler?.PlatformView is not UIView nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpInfo() ?? "null renderer";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewExtensions.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewExtensions.cs
new file mode 100644
index 0000000..752779d
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Helpers
+{
+    public static class ViewExtensions
+    {
+        private const int IndentCount = 4;
+
+        private const string StringFormat = "Dumping iOS UIView hierarchy:{0}{1}";
+
+        public static string DumpHierarchy(this UIView view, bool isVerbose)
+        {
+            var hierarchyStringBuilder = new ViewHierarchyStringBuilder(IndentCount);
+            ViewVisitor.Visit(view, hierarchyStringBuilder.Add, isVerbose);
+            return string.Format(StringFormat, Environment.NewLine, hierarchyStringBuilder);
+        }
+
+        public static string DumpInfo(this UIView view)
+        {
+            string indentSpace = $"{Environment.NewLine}    ";
+
+            var result = $"Dumping info for {view.GetType().Name}:"
+                + indentSpace + $"Bounds: ( {view.Bounds} )"
+                + indentSpace + $"Frame: ( {view.Frame} )"
+                + indentSpace + $"LayoutMargins: ( {view.LayoutMargins} )";
+
+            return result;
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewHierarchyPrinter.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewHierarchyPrinter.cs
new file mode 100644
index 0000000..92897af
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewHierarchyPrinter.cs
@@ -0,0 +1,41 @@
+using System.Text;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Helpers
+{
+    public class ViewHierarchyStringBuilder
+    {
+        private readonly StringBuilder _stringBuilder;
+
+        private readonly string _indentSpace;
+
+        public ViewHierarchyStringBuilder(int indentCount)
+        {
+            _stringBuilder = new StringBuilder();
+            _indentSpace = string.Empty.PadLeft(indentCount);
+        }
+
+        public void Add(UIView view, int depth, bool isVerbose = false)
+        {
+            for (int i = 0; i < depth; i++)
+            {
+                _stringBuilder.Append(_indentSpace);
+            }
+
+            _stringBuilder.Append($"<{view.GetType().Name}");
+
+            if (isVerbose)
+            {
+                _stringBuilder.Append($" Frame={view.Frame}");
+            }
+
+            _stringBuilder.AppendLine(">");
+        }
+
+        public override string ToString()
+        {
+            return _stringBuilder.ToString();
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewVisitor.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewVisitor.cs
new file mode 100644
index 0000000..920d165
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Helpers/ViewVisitor.cs
@@ -0,0 +1,27 @@
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Helpers
+{
+    public static class ViewVisitor
+    {
+        public static void Visit(UIView view, Action<UIView, int, bool> action, bool isVerbose)
+        {
+            Visit(view, action, 0, isVerbose);
+        }
+
+        private static void Visit(object @object, Action<UIView, int, bool> action, int currentDepth, bool isVerbose)
+        {
+            if (!(@object is UIView view))
+            {
+                return;
+            }
+
+            action(view, currentDepth, isVerbose);
+
+            for (int i = 0; i < view.Subviews.Length; i++)
+            {
+                Visit(view.Subviews[i], action, currentDepth + 1, isVerbose);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Initializer.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Initializer.cs
new file mode 100644
index 0000000..c4dc798
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Initializer.cs
@@ -0,0 +1,15 @@
+using Sharpnado.CollectionView.iOS.Helpers;
+using Sharpnado.CollectionView.iOS.Renderers;
+
+namespace Sharpnado.CollectionView.iOS
+{
+    public static class Initializer
+    {
+        public static void Initialize(bool enableInternalLogger = false, bool enableInternalDebugLogger = false)
+        {
+            InternalLogger.EnableLogger(enableInternalLogger, enableInternalDebugLogger);
+            PlatformHelper.InitializeSingleton(new iOSPlatformHelper());
+            CollectionViewRenderer.Initialize();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/PlatformClass1.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/PlatformClass1.cs
deleted file mode 100644
index 8e517d0..0000000
--- a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/PlatformClass1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Sharpnado.CollectionView.Maui
-{
-    // All the code in this file is only included on iOS.
-    public class PlatformClass1
-    {
-    }
-}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CenteredCollectionViewFlowLayout.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CenteredCollectionViewFlowLayout.cs
new file mode 100644
index 0000000..b275119
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CenteredCollectionViewFlowLayout.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Runtime.InteropServices;
+
+using CoreGraphics;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public class CenteredCollectionViewFlowLayout : UICollectionViewFlowLayout
+    {
+        public override UICollectionViewLayoutAttributes[] LayoutAttributesForElementsInRect(CGRect rect)
+        {
+            var result = base.LayoutAttributesForElementsInRect(rect);
+
+            int columnCount = ComputeColumnCount(result);
+            NFloat centerXDelta = rect.Width / (columnCount + 1);
+            NFloat nextCenterX = centerXDelta;
+            NFloat previousRight = -1;
+
+            UICollectionViewLayoutAttributes[] clonedResult = new UICollectionViewLayoutAttributes[result.Length];
+            for (int index = 0; index < result.Length; index++)
+            {
+                clonedResult[index] = (UICollectionViewLayoutAttributes)result[index].Copy();
+            }
+
+            foreach (var layoutAttribute in clonedResult)
+            {
+                if (layoutAttribute.Frame.Left < previousRight)
+                {
+                    // new line
+                    nextCenterX = centerXDelta;
+                }
+
+                previousRight = layoutAttribute.Frame.Right;
+
+                layoutAttribute.Center = new CGPoint(nextCenterX, layoutAttribute.Center.Y);
+
+                nextCenterX += centerXDelta;
+            }
+
+            return clonedResult;
+        }
+
+        private int ComputeColumnCount(UICollectionViewLayoutAttributes[] attributes)
+        {
+            int columnCount = 0;
+            NFloat previousRight = -1;
+            foreach (var layoutAttribute in attributes)
+            {
+                if (layoutAttribute.Frame.Left < previousRight)
+                {
+                    break;
+                }
+
+                previousRight = layoutAttribute.Frame.Right;
+                columnCount++;
+            }
+
+            return columnCount;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs
new file mode 100644
index 0000000..842f49d
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs
@@ -0,0 +1,181 @@
+using System.Collections;
+
+using CoreGraphics;
+
+using Foundation;
+
+using Sharpnado.CollectionView.ViewModels;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public partial class CollectionViewRenderer
+    {
+        private UIGestureRecognizer _dragAndDropGesture;
+
+        private void EnableDragAndDrop(bool isEnabled, DragAndDropTrigger dragAndDropTrigger)
+        {
+            if (_dragAndDropGesture != null)
+            {
+                Control.RemoveGestureRecognizer(_dragAndDropGesture);
+                _dragAndDropGesture = null;
+                return;
+            }
+
+            if (!isEnabled)
+            {
+                return;
+            }
+
+            int from = -1;
+            NSIndexPath pathTo = null;
+            iOSViewCell draggedViewCell = null;
+
+            // Create a custom gesture recognizer
+            _dragAndDropGesture = dragAndDropTrigger == DragAndDropTrigger.Pan
+                ? new UIPanGestureRecognizer(
+                    gesture =>
+                    {
+                        // Take action based on state
+                        HandleDragByGestureState(gesture.State, gesture, ref from, ref pathTo, ref draggedViewCell);
+                    })
+                : new UILongPressGestureRecognizer(
+                    gesture =>
+                    {
+                        // Take action based on state
+                        HandleDragByGestureState(gesture.State, gesture, ref from, ref pathTo, ref draggedViewCell);
+                    });
+
+            // Add the custom recognizer to the collection view
+            Control.AddGestureRecognizer(_dragAndDropGesture);
+        }
+
+        private void HandleDragByGestureState(
+            UIGestureRecognizerState state,
+            UIGestureRecognizer gesture,
+            ref int from,
+            ref NSIndexPath pathTo,
+            ref iOSViewCell draggedViewCell)
+        {
+            switch (state)
+            {
+                case UIGestureRecognizerState.Began:
+                    var selectedIndexPath = Control.IndexPathForItemAtPoint(gesture.LocationInView(Control));
+                    if (selectedIndexPath != null)
+                    {
+                        draggedViewCell = (iOSViewCell)Control.CellForItem(selectedIndexPath);
+                        if (draggedViewCell.FormsCell is DraggableViewCell draggableViewCell)
+                        {
+                            if (!draggableViewCell.IsDraggable)
+                            {
+                                Control.CancelInteractiveMovement();
+                                return;
+                            }
+
+                            draggableViewCell.IsDragAndDropping = true;
+                        }
+
+                        from = (int)selectedIndexPath.Item;
+                        Control.BeginInteractiveMovementForItem(selectedIndexPath);
+                        Element.IsDragAndDropping = true;
+
+                        Element.DragAndDropStartedCommand?.Execute(
+                            new DragAndDropInfo(from, -1, Element.BindingContext));
+                    }
+
+                    break;
+
+                case UIGestureRecognizerState.Changed:
+                    if (draggedViewCell == null)
+                    {
+                        return;
+                    }
+
+                    var gestureLocation = gesture.LocationInView(gesture.View);
+                    var changedPath = Control.IndexPathForItemAtPoint(gestureLocation);
+                    if (changedPath != null)
+                    {
+                        // draggedViewCell = (iOSViewCell)Control.CellForItem(changedPath);
+                        if (draggedViewCell.FormsCell is DraggableViewCell { IsDraggable: false })
+                        {
+                            pathTo = null;
+
+                            // System.Diagnostics.Debug.WriteLine("Cancel change state");
+                            return;
+                        }
+
+                        pathTo = changedPath;
+
+                        // System.Diagnostics.Debug.WriteLine($"State changed to {pathTo.Item}");
+                    }
+
+                    switch (Element.DragAndDropDirection)
+                    {
+                        case DragAndDropDirection.HorizontalOnly:
+                            Control.UpdateInteractiveMovement(new CGPoint(gestureLocation.X, draggedViewCell.Center.Y));
+                            break;
+                        case DragAndDropDirection.VerticalOnly:
+                            Control.UpdateInteractiveMovement(new CGPoint(draggedViewCell.Center.X, gestureLocation.Y));
+                            break;
+                        default:
+                            Control.UpdateInteractiveMovement(gestureLocation);
+                            break;
+                    }
+
+                    break;
+
+                case UIGestureRecognizerState.Ended:
+                    if (from < 0 || pathTo == null)
+                    {
+                        // System.Diagnostics.Debug.WriteLine($"Ended but cancelled cause incorrect parameters");
+                        Control.CancelInteractiveMovement();
+                        return;
+                    }
+
+                    var targetViewCell = (iOSViewCell)Control.CellForItem(pathTo);
+                    if (targetViewCell?.FormsCell is DraggableViewCell targetDraggableViewCell
+                        && !targetDraggableViewCell.IsDraggable)
+                    {
+                        // System.Diagnostics.Debug.WriteLine($"Ended but cancelled cause target is not draggable");
+                        Control.CancelInteractiveMovement();
+                        return;
+                    }
+
+                    // System.Diagnostics.Debug.WriteLine($"Ended from: {from} to: {pathTo.Item}");
+                    Control.EndInteractiveMovement();
+                    if (_itemsSource is IList itemsSourceList)
+                    {
+                        try
+                        {
+                            _isMovedBackfire = true;
+                            var item = itemsSourceList[from];
+                            itemsSourceList.RemoveAt(from);
+                            itemsSourceList.Insert((int)pathTo.Item, item);
+                            var to = itemsSourceList.IndexOf(item);
+                            Element.IsDragAndDropping = false;
+
+                            if (draggedViewCell?.FormsCell is DraggableViewCell draggableViewCell)
+                            {
+                                draggableViewCell.IsDragAndDropping = false;
+                                Element.DragAndDropEndedCommand?.Execute(
+                                    new DragAndDropInfo(from, to, draggableViewCell.BindingContext));
+                            }
+
+                            draggedViewCell = null;
+                        }
+                        finally
+                        {
+                            _isMovedBackfire = false;
+                        }
+                    }
+
+                    break;
+
+                default:
+                    Control.CancelInteractiveMovement();
+                    break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.cs
new file mode 100644
index 0000000..023eae1
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/CollectionViewRenderer.cs
@@ -0,0 +1,498 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+using CoreGraphics;
+
+using Foundation;
+
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Platform;
+
+using Sharpnado.CollectionView.iOS.Helpers;
+using Sharpnado.Tasks;
+using UIKit;
+
+using ContentView = Microsoft.Maui.Controls.ContentView;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    [Foundation.Preserve]
+    public partial class CollectionViewRenderer : Microsoft.Maui.Controls.Handlers.Compatibility.ViewRenderer<CollectionView, UICollectionView>
+    {
+        private readonly List<DataTemplate> _registeredDataTemplates = new ();
+
+        private IEnumerable _itemsSource;
+        private UICollectionView _collectionView;
+
+        private bool _isMovedBackfire;
+        private bool _isFirstInitialization = true;
+        private bool _isRefreshViewUserEnabled = false;
+
+        private bool _isDisposed = false;
+
+        private int _lastVisibleItemIndex = -1;
+
+        public CollectionViewRenderer()
+        {
+            AutoPackage = false;
+        }
+
+        public static void Initialize()
+        {
+        }
+
+        public override void LayoutSubviews()
+        {
+            double height = Bounds.Height;
+            double width = Bounds.Width;
+
+            InternalLogger.Debug($"LayoutSubviews( bounds: {Bounds} )");
+
+            if (_collectionView == null || height <= 0 || width <= 0)
+            {
+                return;
+            }
+
+            _collectionView.Frame = new CGRect(0, 0, width, height);
+
+            if (Control == null)
+            {
+                SetCollectionView(_collectionView);
+            }
+
+            if (ComputeItemSize(width, height) && _collectionView.CollectionViewLayout is UICollectionViewFlowLayout flowLayout)
+            {
+                flowLayout.ItemSize = new CGSize(Element.ItemWidth, Element.ItemHeight);
+                UpdateItemsSource();
+                ScrollToCurrentItem();
+            }
+
+            base.LayoutSubviews();
+
+            InternalLogger.Debug($"collectionView bounds: {_collectionView.Bounds}");
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _isDisposed = true;
+
+            CleanUp();
+
+            base.Dispose(disposing);
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case nameof(CollectionView.Height):
+                case nameof(CollectionView.Width):
+                    InternalLogger.Debug(() => $"Maui width: {Element.Width}, height: {Element.Height}");
+                    break;
+
+                case nameof(CollectionView.ItemsSource):
+                    UpdateItemsSource();
+                    break;
+                case nameof(CollectionView.CurrentIndex) when Control?.Delegate is SizedFlowLayout
+                {
+                    IsCurrentIndexUpdateBackfire: false
+                }:
+                    ScrollToCurrentItem();
+                    break;
+                case nameof(CollectionView.DisableScroll):
+                    ProcessDisableScroll();
+                    break;
+                case nameof(CollectionView.ColumnCount):
+                case nameof(CollectionView.CollectionLayout):
+                    UpdateListLayout();
+                    break;
+                case nameof(CollectionView.EnableDragAndDrop):
+                    UpdateEnableDragAndDrop();
+                    break;
+            }
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CollectionView> e)
+        {
+            base.OnElementChanged(e);
+
+            if (e.OldElement != null)
+            {
+                CleanUp();
+            }
+
+            if (e.NewElement != null)
+            {
+                CreateView();
+            }
+        }
+
+        private void CleanUp()
+        {
+            if (_collectionView != null)
+            {
+                _collectionView.Dispose();
+                _collectionView.DataSource?.Dispose();
+                _collectionView.CollectionViewLayout?.Dispose();
+                _collectionView.Delegate?.Dispose();
+                _collectionView = null;
+            }
+
+            if (_itemsSource is INotifyCollectionChanged oldNotifyCollection)
+            {
+                oldNotifyCollection.CollectionChanged -= OnCollectionChanged;
+            }
+
+            _dragAndDropGesture?.Dispose();
+            _dragAndDropGesture = null;
+            _itemsSource = null;
+            _registeredDataTemplates.Clear();
+        }
+
+        private bool ComputeItemSize(double width, double height)
+        {
+            if (Control == null
+                || Element == null
+                || (Element.ColumnCount == 0
+                    && (Element.IsLayoutHorizontal && Element.ItemHeight > 0)))
+            {
+                return false;
+            }
+
+            bool widthChanged = false;
+            bool heightChanged = false;
+            if (Element.ColumnCount > 0)
+            {
+                double newItemWidth = Element.ComputeItemWidth(width);
+                if (Element.ItemWidth != newItemWidth)
+                {
+                    Element.ItemWidth = newItemWidth;
+                    widthChanged = true;
+                }
+            }
+
+            if (Element.IsLayoutHorizontal && Element.ItemHeight == 0)
+            {
+                double newItemHeight = Element.ComputeItemHeight(height);
+                if (Element.ItemHeight != newItemHeight)
+                {
+                    Element.ItemHeight = newItemHeight;
+                    heightChanged = true;
+
+                    Element.HeightRequest = Element.ItemHeight
+                        + Element.CollectionPadding.VerticalThickness
+                        + Element.Margin.VerticalThickness;
+                }
+            }
+
+            InternalLogger.Info($"ComputeItemSize: w{Element.ItemWidth}, h{Element.ItemHeight}, heightRequest: {Element.HeightRequest}");
+            return widthChanged || heightChanged;
+        }
+
+        private void CreateView()
+        {
+            InternalLogger.Info("CreateView");
+
+            if (_isFirstInitialization)
+            {
+                Element.CheckConsistency();
+                _isFirstInitialization = false;
+            }
+
+            if (Element.IsInPullToRefresh() && Element.Parent is ContentView refreshView)
+            {
+                _isRefreshViewUserEnabled = refreshView.IsEnabled;
+                refreshView.IsEnabled = false;
+            }
+
+            Control?.DataSource?.Dispose();
+            Control?.Delegate?.Dispose();
+            Control?.CollectionViewLayout?.Dispose();
+            Control?.Dispose();
+
+            var layout = BuildListLayout();
+
+            // Otherwise the UICollectionView doesn't seem to take enough space
+            //if ((Element.CollectionLayout != CollectionViewLayout.Grid || Element.CollectionLayout == CollectionViewLayout.Vertical) && Element.ItemHeight > 0)
+            //{
+            //    Element.HeightRequest = Element.ItemHeight
+            //        + Element.CollectionPadding.VerticalThickness
+            //        + Element.Margin.VerticalThickness;
+            //}
+
+            var rect = new CGRect(0, 0, 100, 100);
+            _collectionView = new UICollectionView(rect, layout)
+            {
+                Delegate = new SizedFlowLayout(Element),
+                DecelerationRate =
+                    Element.ScrollSpeed == ScrollSpeed.Normal
+                        ? UIScrollView.DecelerationRateNormal
+                        : UIScrollView.DecelerationRateFast,
+                BackgroundColor = Element?.BackgroundColor?.ToPlatform(),
+                ShowsHorizontalScrollIndicator = false,
+                ContentInset = new UIEdgeInsets(0, 0, 0, 0),
+            };
+
+            SetCollectionView(_collectionView);
+        }
+
+        private void SetCollectionView(UICollectionView collectionView)
+        {
+            SetNativeControl(collectionView);
+            UpdateItemsSource();
+
+            if (Element.IsInPullToRefresh() && Element.Parent is ContentView refreshView && _isRefreshViewUserEnabled)
+            {
+                refreshView.IsEnabled = true;
+            }
+
+            EnableDragAndDrop(Element.EnableDragAndDrop, Element.DragAndDropTrigger);
+
+            ScrollToCurrentItem();
+            ProcessDisableScroll();
+        }
+
+        private UICollectionViewFlowLayout BuildListLayout()
+        {
+            var sectionInset = new UIEdgeInsets(
+                (NFloat)Element.CollectionPadding.Top,
+                (NFloat)Element.CollectionPadding.Left,
+                (NFloat)Element.CollectionPadding.Bottom,
+                (NFloat)Element.CollectionPadding.Right);
+
+            return Element.CollectionLayout == CollectionViewLayout.Grid || Element.CollectionLayout == CollectionViewLayout.Vertical
+                       ? new UICollectionViewFlowLayout
+                       {
+                           ScrollDirection = UICollectionViewScrollDirection.Vertical,
+                           ItemSize = new CGSize(Element.ItemWidth, Element.ItemHeight),
+                           MinimumInteritemSpacing = Element.ItemSpacing,
+                           MinimumLineSpacing = Element.ItemSpacing,
+                           SectionInset = sectionInset,
+                       }
+                       : new SnappingCollectionViewLayout(Element.SnapStyle)
+                       {
+                           ScrollDirection = UICollectionViewScrollDirection.Horizontal,
+                           ItemSize = new CGSize(Element.ItemWidth, Element.ItemHeight),
+                           MinimumInteritemSpacing = 500,
+                           MinimumLineSpacing = Element.ItemSpacing,
+                           SectionInset = sectionInset,
+                       };
+        }
+
+        private void ScrollToCurrentItem()
+        {
+            if (Control == null
+                || Element.CurrentIndex == -1
+                || Element.CurrentIndex >= Control.NumberOfItemsInSection(0)
+                || Control.NumberOfItemsInSection(0) == 0)
+            {
+                return;
+            }
+
+            InternalLogger.Info($"ScrollToCurrentItem( Element.CurrentIndex = {Element.CurrentIndex} )");
+            if (Control.Delegate is SizedFlowLayout sizedFlowLayout)
+            {
+                sizedFlowLayout.IsInternalScroll = true;
+            }
+
+            Control.LayoutIfNeeded();
+
+            UICollectionViewScrollPosition position = UICollectionViewScrollPosition.Top;
+            if (Element.IsLayoutHorizontal)
+            {
+                switch (Element.SnapStyle)
+                {
+                    case SnapStyle.Center:
+                        position = UICollectionViewScrollPosition.CenteredHorizontally;
+                        break;
+                    case SnapStyle.Start:
+                        position = UICollectionViewScrollPosition.Left;
+                        break;
+                }
+            }
+
+            Control.ScrollToItem(
+                NSIndexPath.FromRowSection(Element.CurrentIndex, 0),
+                position,
+                Element.AnimateScroll);
+        }
+
+        private void ProcessDisableScroll()
+        {
+            if (Control == null)
+            {
+                return;
+            }
+
+            Control.ScrollEnabled = !Element.DisableScroll;
+        }
+
+        private void UpdateEnableDragAndDrop()
+        {
+            if (Control == null)
+            {
+                return;
+            }
+
+            EnableDragAndDrop(Element.EnableDragAndDrop, Element.DragAndDropTrigger);
+
+            ((iOSViewSource)Control.DataSource).OnEnableDragAndDropUpdated(Element.EnableDragAndDrop);
+        }
+
+        private void UpdateItemsSource()
+        {
+            if (Control == null)
+            {
+                return;
+            }
+
+            InternalLogger.Info("UpdateItemsSource");
+
+            var oldDataSource = Control.DataSource;
+
+            if (_itemsSource is INotifyCollectionChanged oldNotifyCollection)
+            {
+                oldNotifyCollection.CollectionChanged -= OnCollectionChanged;
+            }
+
+            _itemsSource = Element.ItemsSource;
+
+            List<DataTemplate> dataTemplates = null;
+            if (Element.ItemTemplate is DataTemplateSelector dataTemplateSelector)
+            {
+                dataTemplates = RegisterCellDataTemplates(dataTemplateSelector);
+            }
+            else
+            {
+                Control.RegisterClassForCell(typeof(iOSViewCell), nameof(iOSViewCell));
+            }
+
+            Control.DataSource = new iOSViewSource(Element, dataTemplates);
+
+            oldDataSource?.Dispose();
+
+            if (_itemsSource is INotifyCollectionChanged newNotifyCollection)
+            {
+                newNotifyCollection.CollectionChanged += OnCollectionChanged;
+            }
+        }
+
+        private CancellationTokenSource _changeLayoutCts;
+
+        private void UpdateListLayout()
+        {
+            if (_collectionView == null || _isDisposed)
+            {
+                return;
+            }
+
+            _changeLayoutCts?.Cancel();
+            _changeLayoutCts = new CancellationTokenSource();
+
+            TaskMonitor.Create(() => ChangeLayoutThrottleAsync(_changeLayoutCts.Token));
+        }
+
+        private async Task ChangeLayoutThrottleAsync(CancellationToken token)
+        {
+            await Task.Delay(50, token);
+            InternalLogger.Info("UpdateListLayout");
+
+            var oldCollectionViewLayout = _collectionView.CollectionViewLayout;
+
+            ComputeItemSize(Bounds.Width, Bounds.Height);
+
+            var newLayout = BuildListLayout();
+            _collectionView.CollectionViewLayout = newLayout;
+            oldCollectionViewLayout?.Dispose();
+
+            UpdateItemsSource();
+            ProcessDisableScroll();
+            ScrollToCurrentItem();
+        }
+
+
+        private List<DataTemplate> RegisterCellDataTemplates(DataTemplateSelector dataTemplateSelector)
+        {
+            var selectorTypeInfo = dataTemplateSelector.GetType().GetTypeInfo();
+            var selectorDataTemplatesProperties =
+                selectorTypeInfo
+                    .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.DeclaredOnly)
+                    .Where(p => typeof(DataTemplate).IsAssignableFrom(p.PropertyType));
+
+            foreach (var selectorDataTemplateProperty in selectorDataTemplatesProperties)
+            {
+                var dataTemplate = (DataTemplate)selectorDataTemplateProperty.GetValue(dataTemplateSelector);
+
+                if (!_registeredDataTemplates.Contains(dataTemplate))
+                {
+                    _registeredDataTemplates.Add(dataTemplate);
+                    Control.RegisterClassForCell(
+                        typeof(iOSViewCell),
+                        IdentifierFormatter.FormatDataTemplateCellIdentifier(_registeredDataTemplates.Count - 1));
+                }
+            }
+
+            return _registeredDataTemplates;
+        }
+
+        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (_isMovedBackfire)
+            {
+                return;
+            }
+
+            if (Control == null || _itemsSource == null)
+            {
+                return;
+            }
+
+            ((iOSViewSource)Control.DataSource).HandleNotifyCollectionChanged(e);
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    var addedIndexPaths = new NSIndexPath[e.NewItems.Count];
+                    for (int addedIndex = e.NewStartingIndex, index = 0;
+                        index < addedIndexPaths.Length;
+                        addedIndex++, index++)
+                    {
+                        addedIndexPaths[index] = NSIndexPath.FromRowSection(addedIndex, 0);
+                    }
+
+                    Control.InsertItems(addedIndexPaths);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    var removedIndexPaths = new NSIndexPath[e.OldItems.Count];
+                    for (int removedIndex = e.OldStartingIndex, index = 0;
+                        index < removedIndexPaths.Length;
+                        removedIndex++, index++)
+                    {
+                        removedIndexPaths[index] = NSIndexPath.FromRowSection(removedIndex, 0);
+                    }
+
+                    Control.DeleteItems(removedIndexPaths);
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    UpdateItemsSource();
+                    break;
+
+                case NotifyCollectionChangedAction.Move:
+                    Control.MoveItem(
+                        NSIndexPath.FromRowSection(e.OldStartingIndex, 0),
+                        NSIndexPath.FromRowSection(e.NewStartingIndex, 0));
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    Control.ReloadItems(new[] { NSIndexPath.FromRowSection(e.NewStartingIndex, 0) });
+                    break;
+            }
+        }
+    }
+}
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SizedFlowLayout.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SizedFlowLayout.cs
new file mode 100644
index 0000000..8ac321b
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SizedFlowLayout.cs
@@ -0,0 +1,301 @@
+using System.Runtime.InteropServices;
+using CoreGraphics;
+
+using Foundation;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public class SizedFlowLayout : UICollectionViewDelegateFlowLayout
+    {
+        private readonly WeakReference<CollectionView> _weakElement;
+
+        private int _lastVisibleItemIndex = -1;
+        private bool _isScrolling;
+
+        public SizedFlowLayout(CollectionView collectionView)
+        {
+            _weakElement = new WeakReference<CollectionView>(collectionView);
+        }
+
+        public bool IsCurrentIndexUpdateBackfire { get; private set; }
+
+        public bool IsInternalScroll { get; set; }
+
+        public override CGSize GetSizeForItem(
+            UICollectionView collectionView,
+            UICollectionViewLayout layout,
+            NSIndexPath indexPath)
+        {
+            if (collectionView.DataSource is iOSViewSource dataSource)
+            {
+                (double itemWidth, double itemHeight) = dataSource.GetSize(indexPath.Row);
+
+                return new CGSize(itemWidth, itemHeight);
+            }
+
+            return new CGSize(0, 0);
+        }
+
+        public override void Scrolled(UIScrollView scrollView)
+        {
+            if (scrollView is not UICollectionView collectionView || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            var infiniteListLoader = element.InfiniteListLoader;
+            if (infiniteListLoader != null)
+            {
+                int lastVisibleIndex =
+                    collectionView.IndexPathsForVisibleItems
+                        .Select(path => path.Row)
+                        .DefaultIfEmpty(-1)
+                        .Max();
+
+                if (_lastVisibleItemIndex == lastVisibleIndex)
+                {
+                    return;
+                }
+
+                _lastVisibleItemIndex = lastVisibleIndex;
+
+                InternalLogger.Info($"OnScrolled( lastVisibleItem: {lastVisibleIndex} )");
+                infiniteListLoader.OnScroll(lastVisibleIndex);
+            }
+
+            if (IsInternalScroll)
+            {
+                IsInternalScroll = false;
+                return;
+            }
+
+            if (_isScrolling)
+            {
+                return;
+            }
+
+            _isScrolling = true;
+            element.ScrollBeganCommand?.Execute(null);
+        }
+
+        public override void ScrollAnimationEnded(UIScrollView scrollView)
+        {
+            OnStopScrolling((UICollectionView)scrollView);
+        }
+
+        public override void DecelerationEnded(UIScrollView scrollView)
+        {
+            if (scrollView is not UICollectionView collectionView || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            if (element.SnapStyle == SnapStyle.Center)
+            {
+                SnapToCenter(collectionView);
+            }
+
+            OnStopScrolling(collectionView);
+        }
+
+        public override void DraggingEnded(UIScrollView scrollView, bool willDecelerate)
+        {
+            if (scrollView is not UICollectionView collectionView || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            if (!willDecelerate)
+            {
+                if (element.SnapStyle == SnapStyle.Center)
+                {
+                    SnapToCenter(collectionView);
+                }
+
+                OnStopScrolling(collectionView);
+            }
+        }
+
+        private void OnStopScrolling(UICollectionView collectionView)
+        {
+            if (collectionView == null || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            if (!_isScrolling)
+            {
+                return;
+            }
+
+            _isScrolling = false;
+
+            IsCurrentIndexUpdateBackfire = true;
+            try
+            {
+                UpdateCurrentIndex(collectionView);
+                element.ScrollEndedCommand?.Execute(null);
+            }
+            finally
+            {
+                IsCurrentIndexUpdateBackfire = false;
+            }
+        }
+
+        private bool IsCellFullyVisible(UICollectionView collectionView, NSIndexPath path)
+        {
+            var cell = collectionView.CellForItem(path);
+
+            if (cell != null)
+            {
+                var firstCellFrame = collectionView.ConvertRectToView(cell.Frame, collectionView.Superview);
+                if (collectionView.Frame.Contains(firstCellFrame))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsFirstCellFullyVisible(UICollectionView collectionView)
+        {
+            return IsCellFullyVisible(collectionView, NSIndexPath.FromItemSection(0, 0));
+        }
+
+        private bool IsLastCellFullyVisible(UICollectionView collectionView)
+        {
+            var lastIndex = NSIndexPath.FromItemSection(collectionView.NumberOfItemsInSection(0) - 1, 0);
+            return IsCellFullyVisible(collectionView, lastIndex);
+        }
+
+        private void SnapToCenter(UICollectionView collectionView)
+        {
+            if (collectionView == null || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            var firstIndex = NSIndexPath.FromItemSection(0, 0);
+            if (IsCellFullyVisible(collectionView, firstIndex))
+            {
+                // Check if first item is fully visible, if true don't snap.
+                collectionView.ScrollToItem(firstIndex, UICollectionViewScrollPosition.CenteredHorizontally, true);
+                return;
+            }
+
+            var lastIndex = NSIndexPath.FromItemSection(collectionView.NumberOfItemsInSection(0) - 1, 0);
+            if (IsCellFullyVisible(collectionView, lastIndex))
+            {
+                // Check if last item is fully visible, if true don't snap.
+                collectionView.ScrollToItem(lastIndex, UICollectionViewScrollPosition.CenteredHorizontally, true);
+                return;
+            }
+
+            var collectionViewCenter = collectionView.Center;
+            var contentOffset = collectionView.ContentOffset;
+            var center = new CGPoint(
+                collectionViewCenter.X
+                + contentOffset.X
+                + (NFloat)element.CollectionPadding.Left
+                - (NFloat)element.CollectionPadding.Right,
+                collectionViewCenter.Y
+                + contentOffset.Y
+                + (NFloat)element.CollectionPadding.Top
+                - (NFloat)element.CollectionPadding.Bottom);
+
+            var indexPath = collectionView.IndexPathForItemAtPoint(center);
+            if (indexPath == null)
+            {
+                // Point is right between two cells: picking one
+                var indexes = collectionView.IndexPathsForVisibleItems.OrderBy(i => i.Item).ToArray();
+                if (indexes.Length > 0)
+                {
+                    int middleIndex = (indexes.Count() - 1) / 2;
+                    var candidateIndexPath = indexes[middleIndex];
+                    if (candidateIndexPath.Row < element.CurrentIndex)
+                    {
+                        indexPath = candidateIndexPath;
+                    }
+                    else
+                    {
+                        indexPath = indexes[middleIndex + 1 > indexes.Length ? middleIndex : middleIndex + 1];
+                    }
+                }
+            }
+
+            collectionView.ScrollToItem(indexPath, UICollectionViewScrollPosition.CenteredHorizontally, true);
+        }
+
+        private void UpdateCurrentIndex(UICollectionView collectionView)
+        {
+            if (collectionView == null || !_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            nint newIndex;
+            if (element.SnapStyle == SnapStyle.Center)
+            {
+                var lastIndex = NSIndexPath.FromItemSection(collectionView.NumberOfItemsInSection(0) - 1, 0);
+                if (IsCellFullyVisible(collectionView, lastIndex))
+                {
+                    newIndex = lastIndex.Item;
+                }
+                else if (IsFirstCellFullyVisible(collectionView))
+                {
+                    newIndex = 0;
+                }
+                else
+                {
+                    var collectionViewCenter = collectionView.Center;
+                    var contentOffset = collectionView.ContentOffset;
+                    var center = new CGPoint(
+                        collectionViewCenter.X
+                        + contentOffset.X
+                        + (NFloat)element.CollectionPadding.Left
+                        - (NFloat)element.CollectionPadding.Right,
+                        collectionViewCenter.Y 
+                        + contentOffset.Y 
+                        + (NFloat)element.CollectionPadding.Top 
+                        - (NFloat)element.CollectionPadding.Bottom);
+
+                    var centerPath = collectionView.IndexPathForItemAtPoint(center);
+                    if (centerPath == null)
+                    {
+                        InternalLogger.Warn(
+                            "Failed to find a NSIndexPath in SnapStyle center context: UpdateCurrentIndex returns nothing");
+                        return;
+                    }
+
+                    newIndex = centerPath.Item;
+                }
+            }
+            else
+            {
+                var firstCellBounds = new CGRect
+                {
+                    X = collectionView.ContentOffset.X,
+                    Y = collectionView.ContentOffset.Y,
+                    Size = new CGSize(element.ItemWidth, element.ItemHeight),
+                };
+
+                var firstCellCenter = new CGPoint(firstCellBounds.GetMidX(), firstCellBounds.GetMidY());
+
+                var indexPath = collectionView.IndexPathForItemAtPoint(firstCellCenter);
+                if (indexPath == null)
+                {
+                    return;
+                }
+
+                newIndex = indexPath.Row;
+            }
+
+            InternalLogger.Info($"UpdateCurrentIndex => {newIndex}");
+
+            element.CurrentIndex = (int)newIndex;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SnappingCollectionViewLayout.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SnappingCollectionViewLayout.cs
new file mode 100644
index 0000000..4399429
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/SnappingCollectionViewLayout.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Runtime.InteropServices;
+
+using CoreGraphics;
+
+using UIKit;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public class SnappingCollectionViewLayout : UICollectionViewFlowLayout
+    {
+        private readonly SnapStyle _snapStyle;
+
+        public SnappingCollectionViewLayout(SnapStyle snapStyle)
+        {
+            _snapStyle = snapStyle;
+        }
+
+        public override CGPoint TargetContentOffset(CGPoint proposedContentOffset, CGPoint scrollingVelocity)
+        {
+            if (_snapStyle != SnapStyle.Start)
+            {
+                return base.TargetContentOffset(proposedContentOffset, scrollingVelocity);
+            }
+
+            NFloat offsetAdjustment = NFloat.MaxValue;
+            NFloat horizontalOffset = proposedContentOffset.X + CollectionView.ContentInset.Left;
+
+            var targetRect = new CGRect(
+                proposedContentOffset.X,
+                0,
+                CollectionView.Bounds.Size.Width,
+                CollectionView.Bounds.Size.Height);
+
+            var layoutAttributesArray = LayoutAttributesForElementsInRect(targetRect);
+
+            foreach (var layoutAttributes in layoutAttributesArray)
+            {
+                var itemOffset = layoutAttributes.Frame.X;
+                if (Math.Abs(itemOffset - horizontalOffset) < Math.Abs(offsetAdjustment))
+                {
+                    offsetAdjustment = itemOffset - horizontalOffset;
+                }
+            }
+
+            return new CGPoint(proposedContentOffset.X + offsetAdjustment, proposedContentOffset.Y);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/UIViewCellHolderQueue.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/UIViewCellHolderQueue.cs
new file mode 100644
index 0000000..1be93c7
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/UIViewCellHolderQueue.cs
@@ -0,0 +1,58 @@
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public class UIViewCellHolderQueue
+    {
+        private readonly Func<UIViewCellHolder> _viewFactory;
+        private readonly Queue<UIViewCellHolder> _views;
+        private readonly int _initialSize;
+
+        public UIViewCellHolderQueue(int initialSize, Func<UIViewCellHolder> viewFactory)
+        {
+            _initialSize = initialSize;
+            _viewFactory = viewFactory;
+            _views = new Queue<UIViewCellHolder>(initialSize);
+        }
+
+        public void Build()
+        {
+            // System.Diagnostics.Debug.WriteLine($"Build: creating {_initialSize} views");
+            for (int i = 0; i < _initialSize; i++)
+            {
+                var view = _viewFactory();
+                lock (_views)
+                {
+                    _views.Enqueue(view);
+                }
+            }
+        }
+
+        public void Clear()
+        {
+            lock (_views)
+            {
+                foreach (var view in _views)
+                {
+                    if (view.TryGetCellContent(out var cellContent))
+                    {
+                        cellContent.Dispose();
+                    }
+                }
+
+                _views.Clear();
+            }
+        }
+
+        public UIViewCellHolder Dequeue()
+        {
+            lock (_views)
+            {
+                if (_views.Count > 0)
+                {
+                    return _views.Dequeue();
+                }
+            }
+
+            return _viewFactory();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/iOSViewSource.cs b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/iOSViewSource.cs
new file mode 100644
index 0000000..1312e1d
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Platforms/iOS/Renderers/iOSViewSource.cs
@@ -0,0 +1,498 @@
+using System.Collections.Specialized;
+using System.Windows.Input;
+using Foundation;
+using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
+using ObjCRuntime;
+using Sharpnado.CollectionView.iOS.Helpers;
+using Sharpnado.Tasks;
+using UIKit;
+using Platform = Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform;
+
+namespace Sharpnado.CollectionView.iOS.Renderers
+{
+    public struct UIViewCellHolder
+    {
+        public static UIViewCellHolder Empty = new(null, null, null);
+
+        private readonly ICommand _tapCommand;
+
+        private readonly WeakReference<UIView> _weakCellContent;
+
+        public UIViewCellHolder(ViewCell formsCell, UIView view, ICommand tapCommand)
+        {
+            FormsCell = formsCell;
+            _tapCommand = tapCommand;
+
+            _weakCellContent = new WeakReference<UIView>(view);
+
+            if (tapCommand != null)
+            {
+                view.AddGestureRecognizer(new UITapGestureRecognizer(OnTap));
+            }
+        }
+
+        public ViewCell FormsCell { get; }
+
+        public bool TryGetCellContent(out UIView cellContent)
+        {
+            return _weakCellContent.TryGetTarget(out cellContent);
+        }
+
+        public static bool operator ==(UIViewCellHolder c1, UIViewCellHolder c2)
+        {
+            if (!c1.TryGetCellContent(out var cellContent1) || !c2.TryGetCellContent(out var cellContent2))
+            {
+                return false;
+            }
+
+            return ReferenceEquals(c1.FormsCell, c2.FormsCell) && ReferenceEquals(cellContent1, cellContent2);
+        }
+
+        public static bool operator !=(UIViewCellHolder c1, UIViewCellHolder c2)
+        {
+            if (!c1.TryGetCellContent(out var cellContent1) || !c2.TryGetCellContent(out var cellContent2))
+            {
+                return true;
+            }
+
+            return !ReferenceEquals(c1.FormsCell, c2.FormsCell) || !ReferenceEquals(cellContent1, cellContent2);
+        }
+
+        public bool Equals(UIViewCellHolder other)
+        {
+            if (!TryGetCellContent(out var cellContent1) || !other.TryGetCellContent(out var cellContent2))
+            {
+                return false;
+            }
+
+            return Equals(FormsCell, other.FormsCell) && Equals(cellContent1, cellContent2);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+            {
+                return false;
+            }
+
+            return obj is UIViewCellHolder holder && Equals(holder);
+        }
+
+        public override int GetHashCode()
+        {
+            TryGetCellContent(out var cellContent);
+
+            unchecked
+            {
+                return ((FormsCell != null ? FormsCell.GetHashCode() : 0) * 397) ^ (cellContent != null ? cellContent.GetHashCode() : 0);
+            }
+        }
+
+        private void OnTap()
+        {
+            if (_tapCommand.CanExecute(null))
+            {
+                _tapCommand.Execute(FormsCell.BindingContext);
+            }
+        }
+    }
+
+    public class iOSViewCell : UICollectionViewCell
+    {
+        private const int InnerViewTag = 99;
+
+        public iOSViewCell(NativeHandle p)
+            : base(p)
+        {
+        }
+
+        public bool IsInitialized => FormsCell != null;
+
+        public ViewCell FormsCell { get; private set; }
+
+        public void Reset()
+        {
+            if (!IsInitialized)
+            {
+                return;
+            }
+
+            FormsCell = null;
+        }
+
+        public void Initialize(ViewCell formsCell, UIView view, CollectionView parent)
+        {
+            FormsCell = formsCell;
+
+            // A previous view may have been added in a different data source
+            ContentView.ViewWithTag(InnerViewTag)?.RemoveFromSuperview();
+
+            view.Tag = InnerViewTag;
+            ContentView.AddSubview(view);
+        }
+
+        public void Bind(object dataContext, CollectionView parent)
+        {
+            InternalLogger.Debug(() => $"Bind with {dataContext}");
+            FormsCell.BindingContext = dataContext;
+            FormsCell.Parent = parent;
+        }
+    }
+
+    public class iOSViewSource : UICollectionViewDataSource
+    {
+        private readonly WeakReference<CollectionView> _weakElement;
+
+        private readonly List<object> _dataSource;
+        private readonly UIViewCellHolderQueue _viewCellHolderCellHolderQueue;
+        private readonly Dictionary<long, WeakReference<iOSViewCell>> _createdCells;
+        private readonly List<DataTemplate> _dataTemplates;
+        private readonly bool _multipleCellTemplates;
+
+        private CancellationTokenSource _enableDragAndDropCts;
+
+        private int _currentMaxPosition = -1;
+
+        public iOSViewSource(CollectionView element, List<DataTemplate> dataTemplates)
+        {
+            _weakElement = new WeakReference<CollectionView>(element);
+            _createdCells = new Dictionary<long, WeakReference<iOSViewCell>>();
+            _dataTemplates = dataTemplates;
+
+            var elementItemsSource = element.ItemsSource;
+            _dataSource = elementItemsSource?.Cast<object>().ToList();
+
+            if (_dataSource == null)
+            {
+                return;
+            }
+
+            _multipleCellTemplates = element.ItemTemplate is DataTemplateSelector;
+
+            if (!_multipleCellTemplates)
+            {
+                // Cache only support single DataTemplate
+                _viewCellHolderCellHolderQueue = new UIViewCellHolderQueue(
+                    element.ViewCacheSize,
+                    () => CreateViewCellHolder());
+                _viewCellHolderCellHolderQueue.Build();
+            }
+        }
+
+        public void HandleNotifyCollectionChanged(NotifyCollectionChangedEventArgs eventArgs)
+        {
+            switch (eventArgs.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    _dataSource.InsertRange(eventArgs.NewStartingIndex, eventArgs.NewItems.Cast<object>());
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    _dataSource.RemoveRange(eventArgs.OldStartingIndex, eventArgs.OldItems.Count);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    _dataSource[eventArgs.NewStartingIndex] = eventArgs.NewItems[0];
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    // Handled in the CollectionViewRenderer class, will just create a new adapter
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    var item = _dataSource[eventArgs.OldStartingIndex];
+                    _dataSource.RemoveAt(eventArgs.OldStartingIndex);
+                    _dataSource.Insert(eventArgs.NewStartingIndex, item);
+                    break;
+            }
+        }
+
+        public override bool CanMoveItem(UICollectionView collectionView, NSIndexPath indexPath) =>
+            _weakElement.TryGetTarget(out var element) && element.EnableDragAndDrop;
+
+        public override void MoveItem(UICollectionView collectionView, NSIndexPath sourceIndexPath, NSIndexPath destinationIndexPath)
+        {
+            var item = _dataSource[(int)sourceIndexPath.Item];
+
+            _dataSource.RemoveAt((int)sourceIndexPath.Item);
+            _dataSource.Insert((int)destinationIndexPath.Item, item);
+        }
+
+        public override nint NumberOfSections(UICollectionView collectionView)
+        {
+            return 1;
+        }
+
+        public override nint GetItemsCount(UICollectionView collectionView, nint section)
+        {
+            return _dataSource?.Count ?? 0;
+        }
+
+        public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
+        {
+            InternalLogger.Debug(() => $"GetCell( index: {indexPath.Row} )");
+
+            iOSViewCell nativeCell;
+            if (!_multipleCellTemplates)
+            {
+                nativeCell = (iOSViewCell)collectionView.DequeueReusableCell(nameof(iOSViewCell), indexPath);
+            }
+            else
+            {
+                var cellType = GetOrCreateItemTemplateIdentifier(collectionView, indexPath);
+                nativeCell = (iOSViewCell)collectionView.DequeueReusableCell(cellType, indexPath);
+            }
+
+            if (!_createdCells.ContainsKey(nativeCell.GetHashCode()))
+            {
+                _createdCells.Add(nativeCell.GetHashCode(), new WeakReference<iOSViewCell>(nativeCell));
+            }
+
+            if (!nativeCell.IsInitialized)
+            {
+                InternalLogger.Debug(() => "Initializing cell");
+                UIViewCellHolder holder;
+                if (_weakElement.TryGetTarget(out var element) && _multipleCellTemplates)
+                {
+                    holder = CreateViewCellHolder(indexPath.Row);
+                }
+                else
+                {
+                    holder = _viewCellHolderCellHolderQueue.Dequeue();
+                }
+
+                if (holder == UIViewCellHolder.Empty)
+                {
+                    return nativeCell;
+                }
+
+                if (_weakElement.TryGetTarget(out var p) && holder.TryGetCellContent(out var cellContent))
+                {
+                    nativeCell.Initialize(holder.FormsCell, cellContent, p);
+                }
+            }
+
+            if (_weakElement.TryGetTarget(out var parent))
+            {
+                nativeCell.Bind(_dataSource[indexPath.Row], parent);
+
+                if (indexPath.Row > _currentMaxPosition)
+                {
+                    _currentMaxPosition = indexPath.Row;
+                    AnimateCell(nativeCell.FormsCell, parent);
+                }
+            }
+
+            return nativeCell;
+        }
+
+        public void OnEnableDragAndDropUpdated(bool isEnabled)
+        {
+            _enableDragAndDropCts?.Cancel();
+            _enableDragAndDropCts = new CancellationTokenSource();
+
+            if (!isEnabled)
+            {
+                return;
+            }
+
+            foreach (var weakViewCell in _createdCells.Values)
+            {
+                if (!weakViewCell.TryGetTarget(out var nativeViewCell))
+                {
+                    continue;
+                }
+
+                HandleDragAndDropEnabledAnimation(nativeViewCell.FormsCell);
+            }
+        }
+
+        public (double ItemWidth, double ItemHeight) GetSize(int itemIndex)
+        {
+            if (!_weakElement.TryGetTarget(out var element))
+            {
+                return (0, 0);
+            }
+
+            if (!element.IsLayoutLinear || element.ItemTemplate is not DataTemplateSelector dataTemplateSelector)
+            {
+                return (element.ItemWidth, element.ItemHeight);
+            }
+
+            var data = _dataSource[itemIndex];
+            var dataTemplate = dataTemplateSelector.SelectTemplate(data, element);
+
+            if (dataTemplate is SizedDataTemplate sizedDataTemplate)
+            {
+                return element.IsLayoutHorizontal
+                    ? (sizedDataTemplate.Size, element.ItemHeight)
+                    : (element.ItemWidth, sizedDataTemplate.Size);
+            }
+
+            if (dataTemplateSelector is SizedDataTemplateSelector sizedDataTemplateSelector)
+            {
+                return element.IsLayoutHorizontal
+                    ? (sizedDataTemplateSelector.GetItemSize(data, element.ItemWidth), element.ItemHeight)
+                    : (element.ItemWidth, sizedDataTemplateSelector.GetItemSize(data, element.ItemHeight));
+            }
+
+            return (element.ItemWidth, element.ItemHeight);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _viewCellHolderCellHolderQueue?.Clear();
+
+            foreach (var weakCreatedCell in _createdCells.Values)
+            {
+                if (weakCreatedCell.TryGetTarget(out var createdCell))
+                {
+                    createdCell.Reset();
+                }
+            }
+
+            _dataTemplates?.Clear();
+            _createdCells?.Clear();
+            _dataSource?.Clear();
+
+            base.Dispose(disposing);
+        }
+
+        private void HandleDragAndDropEnabledAnimation(ViewCell viewCell)
+        {
+            if (!_weakElement.TryGetTarget(out var element))
+            {
+                return;
+            }
+
+            if (_enableDragAndDropCts != null
+                && !_enableDragAndDropCts.IsCancellationRequested
+                && element.EnableDragAndDrop
+                && element.DragAndDropEnabledAnimationAsync != null)
+            {
+                InternalLogger.Debug("HandleDragAndDropEnabledAnimation");
+
+                TaskMonitor.Create(element.DragAndDropEnabledAnimationAsync(viewCell, _enableDragAndDropCts.Token));
+            }
+        }
+
+        private void AnimateCell(ViewCell cell, CollectionView element)
+        {
+            TaskMonitor.Create(
+                async () =>
+                    {
+                        if (element.PreRevealAnimationAsync != null)
+                        {
+                            await element.PreRevealAnimationAsync(cell);
+                        }
+
+                        if (element.RevealAnimationAsync != null)
+                        {
+                            await element.RevealAnimationAsync(cell);
+                        }
+
+                        if (element.PostRevealAnimationAsync != null)
+                        {
+                            await element.PostRevealAnimationAsync(cell);
+                        }
+                    });
+        }
+
+        private string GetOrCreateItemTemplateIdentifier(UICollectionView collectionView, NSIndexPath indexPath)
+        {
+            if (_weakElement.TryGetTarget(out var element) && element.ItemTemplate is DataTemplateSelector dataTemplateSelector)
+            {
+                var item = _dataSource[(int)indexPath.Item];
+                var template = dataTemplateSelector.SelectTemplate(item, element);
+                var templateIndex = _dataTemplates.IndexOf(template);
+                if (templateIndex == -1)
+                {
+                    // Rare cases where DataTemplate of the DataTemplateSelectors are not public properties
+                    _dataTemplates.Add(template);
+                    templateIndex = _dataTemplates.Count - 1;
+                    collectionView.RegisterClassForCell(
+                        typeof(iOSViewCell),
+                        IdentifierFormatter.FormatDataTemplateCellIdentifier(templateIndex));
+                }
+
+                return IdentifierFormatter.FormatDataTemplateCellIdentifier(templateIndex);
+            }
+
+            return nameof(iOSViewCell);
+        }
+
+        private UIViewCellHolder CreateViewCellHolder(int itemIndex = -1)
+        {
+            ViewCell formsCell = null;
+
+            if (!_weakElement.TryGetTarget(out var element))
+            {
+                return UIViewCellHolder.Empty;
+            }
+
+            (double itemWidth, double itemHeight) = GetSize(itemIndex);
+
+            if (element.ItemTemplate is DataTemplateSelector selector)
+            {
+                if (itemIndex == -1)
+                {
+                    throw new InvalidOperationException("Cannot select a DataTemplate without an itemIndex");
+                }
+
+                var template = selector.SelectTemplate(_dataSource[itemIndex], element);
+                if (template is SizedDataTemplate sizedDataTemplate)
+                {
+                    template = sizedDataTemplate.DataTemplate;
+                }
+
+                formsCell = (ViewCell)template.CreateContent();
+            }
+            else
+            {
+                formsCell = (ViewCell)element.ItemTemplate.CreateContent();
+            }
+
+            formsCell.Parent = element;
+            formsCell.View.Layout(new Rect(0, 0, itemWidth, itemHeight));
+
+            IVisualElementRenderer visualElementRenderer = Platform.GetRenderer(formsCell.View);
+            if (visualElementRenderer != null)
+            {
+                DisposeRendererAndChildren(visualElementRenderer);
+            }
+
+            if (visualElementRenderer == null)
+            {
+                visualElementRenderer = Platform.CreateRenderer(formsCell.View);
+                Platform.SetRenderer(formsCell.View, visualElementRenderer);
+            }
+
+            var nativeView = visualElementRenderer.NativeView;
+            nativeView.Frame = formsCell.View.Bounds.ToRectangleF();
+
+            HandleDragAndDropEnabledAnimation(formsCell);
+
+            return new UIViewCellHolder(formsCell, nativeView, element.TapCommand);
+        }
+
+        internal static void DisposeRendererAndChildren(IVisualElementRenderer rendererToRemove)
+        {
+            if (rendererToRemove == null)
+            {
+                return;
+            }
+
+            if (rendererToRemove.NativeView != null)
+            {
+                var subviews = rendererToRemove.NativeView.Subviews;
+                for (var i = 0; i < subviews.Length; i++)
+                {
+                    if (subviews[i] is IVisualElementRenderer childRenderer)
+                    {
+                        DisposeRendererAndChildren(childRenderer);
+                    }
+                }
+
+                rendererToRemove.NativeView.RemoveFromSuperview();
+            }
+
+            rendererToRemove.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Maui/Sharpnado.CollectionView.Maui/ReadMe.md b/Maui/Sharpnado.CollectionView.Maui/ReadMe.md
index 217a5df..80a4a0a 100644
--- a/Maui/Sharpnado.CollectionView.Maui/ReadMe.md
+++ b/Maui/Sharpnado.CollectionView.Maui/ReadMe.md
@@ -29,3 +29,32 @@ public static MauiApp CreateMauiApp()
 
 ## Usage
 
+```xml
+<!--  As a Grid  -->
+<sho:GridView
+    x:Name="HorizontalListView"
+    CollectionPadding="30"
+    ColumnCount="3"
+    EnableDragAndDrop="True"
+    HeightRequest="390"
+    HorizontalOptions="Fill"
+    ItemHeight="110"
+    ItemsSource="{Binding Logo, Mode=OneTime}" />
+
+<!--  As a List with groups  -->
+<sho:CollectionView
+    CollectionLayout="Vertical"
+    CollectionPadding="0,30,0,30"
+    CurrentIndex="{Binding CurrentIndex}"
+    ItemHeight="120"
+    ItemTemplate="{StaticResource HeaderFooterGroupingTemplateSelector}"
+    ItemsSource="{Binding SillyPeople}"
+    ScrollBeganCommand="{Binding OnScrollBeginCommand}"
+    ScrollEndedCommand="{Binding OnScrollEndCommand}"
+    TapCommand="{Binding TapCommand}" />
+
+<!--  As a carousel -->
+<sho:CarouselView />
+
+<!--  As a HorizontalListView -->
+<sho:HorizontalListView />
diff --git a/Maui/Sharpnado.CollectionView.Maui/Sharpnado.CollectionView.Maui.csproj b/Maui/Sharpnado.CollectionView.Maui/Sharpnado.CollectionView.Maui.csproj
index 28a90a2..341281c 100644
--- a/Maui/Sharpnado.CollectionView.Maui/Sharpnado.CollectionView.Maui.csproj
+++ b/Maui/Sharpnado.CollectionView.Maui/Sharpnado.CollectionView.Maui.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net6.0;net6.0-ios;net6.0-android</TargetFrameworks>
 
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
 		<RootNamespace>Sharpnado.CollectionView</RootNamespace>
@@ -91,30 +90,6 @@
 		<FileVersion>3.0.0</FileVersion>
 	</PropertyGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\JniExtensions.cs" Link="Platforms\Android\Helpers\JniExtensions.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\JniWeakReference.cs" Link="Platforms\Android\Helpers\JniWeakReference.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\PlatformHelper.cs" Link="Platforms\Android\Helpers\PlatformHelper.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\ViewExtensions.cs" Link="Platforms\Android\Helpers\ViewExtensions.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\ViewHierarchyPrinter.cs" Link="Platforms\Android\Helpers\ViewHierarchyPrinter.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Helpers\ViewVisitor.cs" Link="Platforms\Android\Helpers\ViewVisitor.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CellCache.cs" Link="Platforms\Android\Renderers\CellCache.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CenterSnapHelper.cs" Link="Platforms\Android\Renderers\CenterSnapHelper.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CollectionViewRenderer.cs" Link="Platforms\Android\Renderers\CollectionViewRenderer.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CollectionViewRenderer.DragAnDropItemTouchHelperCallback.cs" Link="Platforms\Android\Renderers\CollectionViewRenderer.DragAnDropItemTouchHelperCallback.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CollectionViewRenderer.OnControlScrollChangedListener.cs" Link="Platforms\Android\Renderers\CollectionViewRenderer.OnControlScrollChangedListener.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CollectionViewRenderer.RecycleViewAdapter.cs" Link="Platforms\Android\Renderers\CollectionViewRenderer.RecycleViewAdapter.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\CustomLinearLayoutManager.cs" Link="Platforms\Android\Renderers\CustomLinearLayoutManager.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\MeasureHelper.cs" Link="Platforms\Android\Renderers\MeasureHelper.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\ResponsiveGridLayoutManager.cs" Link="Platforms\Android\Renderers\ResponsiveGridLayoutManager.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\SlowRecyclerView.cs" Link="Platforms\Android\Renderers\SlowRecyclerView.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\StartSnapHelper.cs" Link="Platforms\Android\Renderers\StartSnapHelper.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Renderers\ViewHolderQueue.cs" Link="Platforms\Android\Renderers\ViewHolderQueue.cs" />
-		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView.Droid\Initializer.cs">
-			<Link>Platforms\Android\Initializer.cs</Link>
-		</Compile>
-	</ItemGroup>
-
 	<ItemGroup>
 		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView\AssemblyConfiguration.cs" Link="AssemblyConfiguration.cs" />
 		<Compile Include="..\..\Xamarin.Forms\Sharpnado.CollectionView\Contract.cs" Link="Contract.cs" />
@@ -151,6 +126,13 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
-
+	
+<!-- 
+  <Target Name="CopyContracts" AfterTargets="AfterBuild">
+    <ItemGroup>
+      <Contracts Include="Domain\*\Contracts\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Contracts)" DestinationFolder="$(SolutionDir)\TeamCollect.Contracts\%(RecursiveDir)\.." SkipUnchangedFiles="true" />
+  </Target> -->
 
 </Project>
diff --git a/Maui/Sharpnado.CollectionView.Maui/Shims/XamarinFormsPlatformIosNamespace.cs b/Maui/Sharpnado.CollectionView.Maui/Shims/XamarinFormsPlatformIosNamespace.cs
new file mode 100644
index 0000000..c2f9fd6
--- /dev/null
+++ b/Maui/Sharpnado.CollectionView.Maui/Shims/XamarinFormsPlatformIosNamespace.cs
@@ -0,0 +1 @@
+namespace Xamarin.Forms.Platform.iOS;
\ No newline at end of file
diff --git a/README.md b/README.md
index 49b0df8..00cfda0 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,38 @@
-# Sharpnado.CollectionView
+# Sharpnado.CollectionView(.Maui)
 **Formerly named `HorizontalListView`**
 
+<p align="left"><img src="Docs/logo_maui.png" height="180"/>
 <p align="left"><img src="Docs/logo.png" height="180"/>
 
 Get it from NuGet:
 
-[![Nuget](https://img.shields.io/nuget/v/Sharpnado.CollectionView.svg)](https://www.nuget.org/packages/Sharpnado.CollectionView)
 
-| Supported platforms        |
-|----------------------------|
-| :heavy_check_mark: Android |
-| :heavy_check_mark: iOS     |
+| MAUI Supported platforms   | XF Supported platforms        |
+|----------------------------|----------------------------|
+| [![Nuget](https://img.shields.io/nuget/v/Sharpnado.CollectionView.Maui.svg)](https://www.nuget.org/packages/Sharpnado.CollectionView)                            | [![Nuget](https://img.shields.io/nuget/v/Sharpnado.CollectionView.svg)](https://www.nuget.org/packages/Sharpnado.CollectionView) |
+| :heavy_check_mark: Android | :heavy_check_mark: Android |
+| :heavy_check_mark: iOS     | :heavy_check_mark: iOS     |
 
-![Presentation](Docs/github_banner.jpg)
+![Presentation](Docs/maui_banner.png)
 
 ## Initialization
 
+### MAUI
+
+* In `MauiProgram.cs`:
+
+```csharp
+public static MauiApp CreateMauiApp()
+{
+    var builder = MauiApp.CreateBuilder();
+    builder
+        .UseMauiApp()
+        .UseSharpnadoCollectionView(loggerEnabled: false);
+}
+```
+
+### Xamarin.Forms
+
 
 * On Core project in `App.xaml.cs`:
 
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.Droid/Renderers/CollectionViewRenderer.cs b/Xamarin.Forms/Sharpnado.CollectionView.Droid/Renderers/CollectionViewRenderer.cs
index c4387b8..7ecd969 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.Droid/Renderers/CollectionViewRenderer.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.Droid/Renderers/CollectionViewRenderer.cs
@@ -6,7 +6,7 @@
 using AndroidX.RecyclerView.Widget;
 
 #if NET6_0_OR_GREATER
-using Microsoft.Maui.Controls.Compatibility.Platform.Android;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
 using Microsoft.Maui.Controls.Platform;
 #endif
 
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Helpers/PlatformHelper.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Helpers/PlatformHelper.cs
index fa747cc..c3c1804 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Helpers/PlatformHelper.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Helpers/PlatformHelper.cs
@@ -1,4 +1,10 @@
-using Sharpnado.CollectionView.RenderedViews;
+#if NET6_0_OR_GREATER
+using Microsoft.Maui.Controls.PlatformConfiguration;
+#endif
+
+using Sharpnado.CollectionView;
+
+using UIKit;
 
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
@@ -15,16 +21,34 @@ public class iOSPlatformHelper : PlatformHelper
 
         public override string DumpNativeViewHierarchy(View formsView, bool verbose)
         {
+#if NET6_0_OR_GREATER
+            if (formsView.Handler?.PlatformView is not UIView nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpHierarchy(verbose) ?? "null renderer";
+#else
             var renderer = Platform.GetRenderer(formsView);
             Platform.SetRenderer(formsView, renderer);
             return renderer.NativeView.DumpHierarchy(verbose);
+#endif
         }
 
         public override string DumpNativeViewInfo(View formsView)
         {
+#if NET6_0_OR_GREATER
+            if (formsView.Handler?.PlatformView is not UIView nativeView)
+            {
+                return "platform view is null";
+            }
+
+            return nativeView.DumpInfo() ?? "null renderer";
+#else
             var renderer = Platform.GetRenderer(formsView);
             Platform.SetRenderer(formsView, renderer);
             return renderer.NativeView.DumpInfo();
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Initializer.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Initializer.cs
index d15a56d..c4dc798 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Initializer.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Initializer.cs
@@ -1,6 +1,5 @@
 using Sharpnado.CollectionView.iOS.Helpers;
 using Sharpnado.CollectionView.iOS.Renderers;
-using Sharpnado.CollectionView.RenderedViews;
 
 namespace Sharpnado.CollectionView.iOS
 {
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CenteredCollectionViewFlowLayout.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CenteredCollectionViewFlowLayout.cs
index 4fc2ab4..b275119 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CenteredCollectionViewFlowLayout.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CenteredCollectionViewFlowLayout.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices;
 
 using CoreGraphics;
 
@@ -13,9 +14,9 @@ public override UICollectionViewLayoutAttributes[] LayoutAttributesForElementsIn
             var result = base.LayoutAttributesForElementsInRect(rect);
 
             int columnCount = ComputeColumnCount(result);
-            nfloat centerXDelta = rect.Width / (columnCount + 1);
-            nfloat nextCenterX = centerXDelta;
-            nfloat previousRight = -1;
+            NFloat centerXDelta = rect.Width / (columnCount + 1);
+            NFloat nextCenterX = centerXDelta;
+            NFloat previousRight = -1;
 
             UICollectionViewLayoutAttributes[] clonedResult = new UICollectionViewLayoutAttributes[result.Length];
             for (int index = 0; index < result.Length; index++)
@@ -44,7 +45,7 @@ public override UICollectionViewLayoutAttributes[] LayoutAttributesForElementsIn
         private int ComputeColumnCount(UICollectionViewLayoutAttributes[] attributes)
         {
             int columnCount = 0;
-            nfloat previousRight = -1;
+            NFloat previousRight = -1;
             foreach (var layoutAttribute in attributes)
             {
                 if (layoutAttribute.Frame.Left < previousRight)
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs
index 27452c0..3f0b31e 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.DragAndDrop.cs
@@ -4,7 +4,7 @@
 
 using Foundation;
 
-using Sharpnado.CollectionView.RenderedViews;
+using Sharpnado.CollectionView;
 using Sharpnado.CollectionView.ViewModels;
 
 using UIKit;
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.cs
index 278c7da..9eb115b 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/CollectionViewRenderer.cs
@@ -5,28 +5,36 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 
 using CoreGraphics;
 
 using Foundation;
 
+#if NET6_0_OR_GREATER
+using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.Controls.Platform;
+#endif
+
+using Sharpnado.CollectionView;
 using Sharpnado.CollectionView.iOS.Helpers;
-using Sharpnado.CollectionView.RenderedViews;
 
 using UIKit;
 
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
 
-using CollectionView = Sharpnado.CollectionView.RenderedViews.CollectionView;
+using CollectionView = Sharpnado.CollectionView.CollectionView;
 using CollectionViewRenderer = Sharpnado.CollectionView.iOS.Renderers.CollectionViewRenderer;
 
+#if !NET6_0_OR_GREATER
 [assembly: ExportRenderer(typeof(CollectionView), typeof(CollectionViewRenderer))]
+#endif
 
 namespace Sharpnado.CollectionView.iOS.Renderers
 {
     [Foundation.Preserve]
-    public partial class CollectionViewRenderer : ViewRenderer<CollectionView.RenderedViews.CollectionView, UICollectionView>
+    public partial class CollectionViewRenderer : ViewRenderer<CollectionView, UICollectionView>
     {
         private readonly List<DataTemplate> _registeredDataTemplates = new ();
 
@@ -74,29 +82,29 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
         {
             switch (e.PropertyName)
             {
-                case nameof(RenderedViews.CollectionView.ItemsSource):
+                case nameof(CollectionView.ItemsSource):
                     UpdateItemsSource();
                     break;
-                case nameof(RenderedViews.CollectionView.CurrentIndex) when Control?.Delegate is SizedFlowLayout
+                case nameof(CollectionView.CurrentIndex) when Control?.Delegate is SizedFlowLayout
                 {
                     IsCurrentIndexUpdateBackfire: false
                 }:
                     ScrollToCurrentItem();
                     break;
-                case nameof(RenderedViews.CollectionView.DisableScroll):
+                case nameof(CollectionView.DisableScroll):
                     ProcessDisableScroll();
                     break;
-                case nameof(RenderedViews.CollectionView.ColumnCount):
-                case nameof(RenderedViews.CollectionView.CollectionLayout):
+                case nameof(CollectionView.ColumnCount):
+                case nameof(CollectionView.CollectionLayout):
                     UpdateListLayout();
                     break;
-                case nameof(RenderedViews.CollectionView.EnableDragAndDrop):
+                case nameof(CollectionView.EnableDragAndDrop):
                     UpdateEnableDragAndDrop();
                     break;
             }
         }
 
-        protected override void OnElementChanged(ElementChangedEventArgs<RenderedViews.CollectionView> e)
+        protected override void OnElementChanged(ElementChangedEventArgs<CollectionView> e)
         {
             base.OnElementChanged(e);
 
@@ -204,7 +212,11 @@ private void CreateView()
                     Element.ScrollSpeed == ScrollSpeed.Normal
                         ? UIScrollView.DecelerationRateNormal
                         : UIScrollView.DecelerationRateFast,
+#if NET6_0_OR_GREATER
+                BackgroundColor = Microsoft.Maui.Controls.Compatibility.Platform.iOS.CompatibilityColorExtensions.ToUIColor(Element?.BackgroundColor),
+#else
                 BackgroundColor = Element?.BackgroundColor.ToUIColor(),
+#endif
                 ShowsHorizontalScrollIndicator = false,
                 ContentInset = new UIEdgeInsets(0, 0, 0, 0),
             };
@@ -229,10 +241,10 @@ private void SetCollectionView(UICollectionView collectionView)
         private UICollectionViewFlowLayout BuildListLayout()
         {
             var sectionInset = new UIEdgeInsets(
-                (nfloat)Element.CollectionPadding.Top,
-                (nfloat)Element.CollectionPadding.Left,
-                (nfloat)Element.CollectionPadding.Bottom,
-                (nfloat)Element.CollectionPadding.Right);
+                (NFloat)Element.CollectionPadding.Top,
+                (NFloat)Element.CollectionPadding.Left,
+                (NFloat)Element.CollectionPadding.Bottom,
+                (NFloat)Element.CollectionPadding.Right);
 
             return Element.CollectionLayout == CollectionViewLayout.Grid || Element.CollectionLayout == CollectionViewLayout.Vertical
                        ? new UICollectionViewFlowLayout
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SizedFlowLayout.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SizedFlowLayout.cs
index e8e632f..1747944 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SizedFlowLayout.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SizedFlowLayout.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
-
+using System.Runtime.InteropServices;
 using CoreGraphics;
 
 using Foundation;
 
-using Sharpnado.CollectionView.RenderedViews;
+using Sharpnado.CollectionView;
 
 using UIKit;
 
@@ -13,14 +13,14 @@ namespace Sharpnado.CollectionView.iOS.Renderers
 {
     public class SizedFlowLayout : UICollectionViewDelegateFlowLayout
     {
-        private readonly WeakReference<RenderedViews.CollectionView> _weakElement;
+        private readonly WeakReference<CollectionView> _weakElement;
 
         private int _lastVisibleItemIndex = -1;
         private bool _isScrolling;
 
-        public SizedFlowLayout(RenderedViews.CollectionView collectionView)
+        public SizedFlowLayout(CollectionView collectionView)
         {
-            _weakElement = new WeakReference<RenderedViews.CollectionView>(collectionView);
+            _weakElement = new WeakReference<CollectionView>(collectionView);
         }
 
         public bool IsCurrentIndexUpdateBackfire { get; private set; }
@@ -203,12 +203,12 @@ private void SnapToCenter(UICollectionView collectionView)
             var center = new CGPoint(
                 collectionViewCenter.X
                 + contentOffset.X
-                + (nfloat)element.CollectionPadding.Left
-                - (nfloat)element.CollectionPadding.Right,
+                + (NFloat)element.CollectionPadding.Left
+                - (NFloat)element.CollectionPadding.Right,
                 collectionViewCenter.Y
                 + contentOffset.Y
-                + (nfloat)element.CollectionPadding.Top
-                - (nfloat)element.CollectionPadding.Bottom);
+                + (NFloat)element.CollectionPadding.Top
+                - (NFloat)element.CollectionPadding.Bottom);
 
             var indexPath = collectionView.IndexPathForItemAtPoint(center);
             if (indexPath == null)
@@ -259,12 +259,12 @@ private void UpdateCurrentIndex(UICollectionView collectionView)
                     var center = new CGPoint(
                         collectionViewCenter.X
                         + contentOffset.X
-                        + (nfloat)element.CollectionPadding.Left
-                        - (nfloat)element.CollectionPadding.Right,
+                        + (NFloat)element.CollectionPadding.Left
+                        - (NFloat)element.CollectionPadding.Right,
                         collectionViewCenter.Y 
                         + contentOffset.Y 
-                        + (nfloat)element.CollectionPadding.Top 
-                        - (nfloat)element.CollectionPadding.Bottom);
+                        + (NFloat)element.CollectionPadding.Top 
+                        - (NFloat)element.CollectionPadding.Bottom);
 
                     var centerPath = collectionView.IndexPathForItemAtPoint(center);
                     if (centerPath == null)
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SnappingCollectionViewLayout.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SnappingCollectionViewLayout.cs
index 4334f09..c129cd4 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SnappingCollectionViewLayout.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/SnappingCollectionViewLayout.cs
@@ -1,8 +1,9 @@
 using System;
+using System.Runtime.InteropServices;
 
 using CoreGraphics;
 
-using Sharpnado.CollectionView.RenderedViews;
+using Sharpnado.CollectionView;
 
 using UIKit;
 
@@ -24,8 +25,8 @@ public override CGPoint TargetContentOffset(CGPoint proposedContentOffset, CGPoi
                 return base.TargetContentOffset(proposedContentOffset, scrollingVelocity);
             }
 
-            nfloat offsetAdjustment = nfloat.MaxValue;
-            nfloat horizontalOffset = proposedContentOffset.X + CollectionView.ContentInset.Left;
+            NFloat offsetAdjustment = NFloat.MaxValue;
+            NFloat horizontalOffset = proposedContentOffset.X + CollectionView.ContentInset.Left;
 
             var targetRect = new CGRect(
                 proposedContentOffset.X,
diff --git a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/iOSViewSource.cs b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/iOSViewSource.cs
index 94998f3..98520bc 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/iOSViewSource.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView.iOS/Renderers/iOSViewSource.cs
@@ -10,8 +10,13 @@
 
 using Foundation;
 
+#if NET6_0_OR_GREATER
+using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
+using Platform = Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform;
+#endif
+
+using Sharpnado.CollectionView;
 using Sharpnado.CollectionView.iOS.Helpers;
-using Sharpnado.CollectionView.RenderedViews;
 using Sharpnado.Tasks;
 
 using UIKit;
@@ -131,7 +136,7 @@ public void Reset()
             FormsCell = null;
         }
 
-        public void Initialize(ViewCell formsCell, UIView view, CollectionView.RenderedViews.CollectionView parent)
+        public void Initialize(ViewCell formsCell, UIView view, CollectionView parent)
         {
             FormsCell = formsCell;
 
@@ -142,7 +147,7 @@ public void Initialize(ViewCell formsCell, UIView view, CollectionView.RenderedV
             ContentView.AddSubview(view);
         }
 
-        public void Bind(object dataContext, CollectionView.RenderedViews.CollectionView parent)
+        public void Bind(object dataContext, CollectionView parent)
         {
             FormsCell.BindingContext = dataContext;
             FormsCell.Parent = parent;
@@ -151,7 +156,7 @@ public void Bind(object dataContext, CollectionView.RenderedViews.CollectionView
 
     public class iOSViewSource : UICollectionViewDataSource
     {
-        private readonly WeakReference<CollectionView.RenderedViews.CollectionView> _weakElement;
+        private readonly WeakReference<CollectionView> _weakElement;
 
         private readonly List<object> _dataSource;
         private readonly UIViewCellHolderQueue _viewCellHolderCellHolderQueue;
@@ -163,9 +168,9 @@ public class iOSViewSource : UICollectionViewDataSource
 
         private int _currentMaxPosition = -1;
 
-        public iOSViewSource(CollectionView.RenderedViews.CollectionView element, List<DataTemplate> dataTemplates)
+        public iOSViewSource(CollectionView element, List<DataTemplate> dataTemplates)
         {
-            _weakElement = new WeakReference<CollectionView.RenderedViews.CollectionView>(element);
+            _weakElement = new WeakReference<CollectionView>(element);
             _createdCells = new Dictionary<long, WeakReference<iOSViewCell>>();
             _dataTemplates = dataTemplates;
 
@@ -379,7 +384,7 @@ private void HandleDragAndDropEnabledAnimation(ViewCell viewCell)
             }
         }
 
-        private void AnimateCell(ViewCell cell, CollectionView.RenderedViews.CollectionView element)
+        private void AnimateCell(ViewCell cell, CollectionView element)
         {
             TaskMonitor.Create(
                 async () =>
@@ -456,9 +461,14 @@ private UIViewCellHolder CreateViewCellHolder(int itemIndex = -1)
             }
 
             // formsCell.Parent = element;
+
+#if NET6_0_OR_GREATER
+            formsCell.View.Layout(new Rect(0, 0, itemWidth, itemHeight));
+#else
             formsCell.View.Layout(new Rectangle(0, 0, itemWidth, itemHeight));
+#endif
 
-            if (Platform.GetRenderer(formsCell.View) == null)
+            if (Microsoft.Maui.Controls.Compatibility.Platform.iOS.Platform.GetRenderer(formsCell.View) == null)
             {
                 IVisualElementRenderer renderer = Platform.CreateRenderer(formsCell.View);
                 Platform.SetRenderer(formsCell.View, renderer);
diff --git a/Xamarin.Forms/Sharpnado.CollectionView/InternalLogger.cs b/Xamarin.Forms/Sharpnado.CollectionView/InternalLogger.cs
index 07d3d9a..e6db21c 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView/InternalLogger.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView/InternalLogger.cs
@@ -25,6 +25,16 @@ public static void Debug(string tag, Func<string> message)
             DiagnosticLog(tag + " | DBUG | " + message());
         }
 
+        public static void Debug(Func<string> message)
+        {
+            if (!EnableDebug)
+            {
+                return;
+            }
+
+            DiagnosticLog("DBUG | " + message());
+        }
+
         public static void Debug(string tag, string format, params object[] parameters)
         {
             if (!EnableDebug)
@@ -77,11 +87,16 @@ private static void DiagnosticLog(string format, params object[] parameters)
                 return;
             }
 
-#if DEBUG
-            System.Diagnostics.Debug.WriteLine(DateTime.Now.ToString("MM-dd H:mm:ss.fff") + " | SharpnadoInternals | " + $"{Thread.CurrentThread.ManagedThreadId:000} | " + format, parameters);
-#else
-            Console.WriteLine(DateTime.Now.ToString("MM-dd H:mm:ss.fff") + " | SharpnadoInternals | " + format, parameters);
-#endif
+            string prompt = DateTime.Now.ToString("MM-dd H:mm:ss.fff") + " | SharpnadoInternals | "
+                            + $"{Thread.CurrentThread.ManagedThreadId:000} | ";
+
+            if (parameters.Length > 0)
+            {
+                Console.WriteLine(prompt + format, parameters);
+                return;
+            }
+
+            Console.WriteLine(prompt + format);
         }
     }
 }
\ No newline at end of file
diff --git a/Xamarin.Forms/Sharpnado.CollectionView/RenderedViews/CollectionView.cs b/Xamarin.Forms/Sharpnado.CollectionView/RenderedViews/CollectionView.cs
index 907d117..5fa14dc 100644
--- a/Xamarin.Forms/Sharpnado.CollectionView/RenderedViews/CollectionView.cs
+++ b/Xamarin.Forms/Sharpnado.CollectionView/RenderedViews/CollectionView.cs
@@ -164,6 +164,26 @@ public class CollectionView : View
         typeof(ICommand),
         typeof(CollectionView));
 
+    public static readonly BindableProperty ScrollingLeftCommandProperty = BindableProperty.Create(
+        nameof(ScrollingLeftCommand),
+        typeof(ICommand),
+        typeof(CollectionView));
+
+    public static readonly BindableProperty ScrollingUpCommandProperty = BindableProperty.Create(
+        nameof(ScrollingUpCommand),
+        typeof(ICommand),
+        typeof(CollectionView));
+
+    public static readonly BindableProperty ScrollingRightCommandProperty = BindableProperty.Create(
+        nameof(ScrollingRightCommand),
+        typeof(ICommand),
+        typeof(CollectionView));
+
+    public static readonly BindableProperty ScrollingDownCommandProperty = BindableProperty.Create(
+        nameof(ScrollingDownCommand),
+        typeof(ICommand),
+        typeof(CollectionView));
+
     public static readonly BindableProperty EnableDragAndDropProperty = BindableProperty.Create(
         nameof(EnableDragAndDrop),
         typeof(bool),
@@ -322,6 +342,30 @@ public ICommand ScrollEndedCommand
         set => SetValue(ScrollEndedCommandProperty, value);
     }
 
+    public ICommand ScrollingLeftCommand
+    {
+        get => (ICommand)GetValue(ScrollingLeftCommandProperty);
+        set => SetValue(ScrollingLeftCommandProperty, value);
+    }
+
+    public ICommand ScrollingUpCommand
+    {
+        get => (ICommand)GetValue(ScrollingUpCommandProperty);
+        set => SetValue(ScrollingUpCommandProperty, value);
+    }
+
+    public ICommand ScrollingDownCommand
+    {
+        get => (ICommand)GetValue(ScrollingDownCommandProperty);
+        set => SetValue(ScrollingDownCommandProperty, value);
+    }
+
+    public ICommand ScrollingRightCommand
+    {
+        get => (ICommand)GetValue(ScrollingRightCommandProperty);
+        set => SetValue(ScrollingRightCommandProperty, value);
+    }
+
     public bool EnableDragAndDrop
     {
         get => (bool)GetValue(EnableDragAndDropProperty);