diff --git a/src/BlazorWebFormsComponents.Test/GridView/AutogenerateColumns.razor b/src/BlazorWebFormsComponents.Test/GridView/AutogenerateColumns.razor
index b8b5a1c..5c01985 100644
--- a/src/BlazorWebFormsComponents.Test/GridView/AutogenerateColumns.razor
+++ b/src/BlazorWebFormsComponents.Test/GridView/AutogenerateColumns.razor
@@ -10,27 +10,31 @@
 </Fixture>
 
 @code {
-		void FirstTest()
-		{
-			var cut = GetComponentUnderTest();
-			var tableHeaders = cut.FindAll("th").ToList();
-			tableHeaders.Count.ShouldBe(4, "Did not render 4 TH elements");
-
-			try {
-				tableHeaders[0].TextContent.ShouldBe("Id");
-			} catch (Exception ex) {
-				Console.WriteLine("HTML rendered: " + cut.Markup);
-				throw;
-			}
+	void FirstTest()
+	{
+		var cut = GetComponentUnderTest();
+		System.Diagnostics.Debug.WriteLine(cut.Markup);
+		var tableHeaders = cut.FindAll("th").ToList();
+		tableHeaders.Count.ShouldBe(4, "Did not render 4 TH elements");
 
-			tableHeaders[1].TextContent.ShouldBe("Name");
-			tableHeaders[2].TextContent.ShouldBe("Price");
-			tableHeaders[3].TextContent.ShouldBe("LastUpdate");
+		try
+		{
+			tableHeaders[0].TextContent.ShouldBe("Id");
 		}
-
-		IQueryable<Widget> GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
+		catch (Exception ex)
 		{
-			totalRowCount = Widget.SimpleWidgetList.Length;
-			return Widget.SimpleWidgetList.AsQueryable();
+			Console.WriteLine("HTML rendered: " + cut.Markup);
+			throw;
 		}
+
+		tableHeaders[1].TextContent.ShouldBe("Name");
+		tableHeaders[2].TextContent.ShouldBe("Price");
+		tableHeaders[3].TextContent.ShouldBe("LastUpdate");
+	}
+
+	IQueryable<Widget> GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
+	{
+		totalRowCount = Widget.SimpleWidgetList.Length;
+		return Widget.SimpleWidgetList.AsQueryable();
+	}
 }
diff --git a/src/BlazorWebFormsComponents.Test/GridView/EmptyDataText.razor b/src/BlazorWebFormsComponents.Test/GridView/EmptyDataText.razor
index 48e498f..40c566b 100644
--- a/src/BlazorWebFormsComponents.Test/GridView/EmptyDataText.razor
+++ b/src/BlazorWebFormsComponents.Test/GridView/EmptyDataText.razor
@@ -11,20 +11,20 @@
 
 @code {
 
-		void FirstTest()
-		{
-			var cut = GetComponentUnderTest();
-			var tableHeaders = cut.FindAll("th").ToList();
-			tableHeaders.Count.ShouldBe(4, "Did not render 4 TH elements");
-			cut.FindAll("tr").Count(e => e.InnerHtml.Contains("td")).ShouldBe(1, "Did not render 1 TR elements");
-			cut.FindAll("td").Count().ShouldBe(1, "Did not render 0 TD elements");
-			cut.Find("td").TextContent.Replace("\t", string.Empty).Replace("\n", string.Empty).ShouldBe("TestText");
-		}
+	void FirstTest()
+	{
+		var cut = GetComponentUnderTest();
+		var tableHeaders = cut.FindAll("th").ToList();
+		tableHeaders.Count.ShouldBe(4, "Did not render 4 TH elements");
+		cut.FindAll("tr").Count(e => e.InnerHtml.Contains("td")).ShouldBe(1, "Did not render 1 TR elements");
+		cut.FindAll("td").Count().ShouldBe(1, "Did not render 0 TD elements");
+		cut.Find("td").TextContent.Replace("\t", string.Empty).Replace("\n", string.Empty).ShouldBe("TestText");
+	}
 
-		IQueryable<Widget> GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
-		{
-			totalRowCount = 0;
-			var widgetList = new List<Widget>();
-			return widgetList.AsQueryable();
-		}
+	IQueryable<Widget> GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
+	{
+		totalRowCount = 0;
+		var widgetList = new List<Widget>();
+		return widgetList.AsQueryable();
+	}
 }
diff --git a/src/BlazorWebFormsComponents.Test/GridView/TemplateFields.razor b/src/BlazorWebFormsComponents.Test/GridView/TemplateFields.razor
index 6760355..cfed59c 100644
--- a/src/BlazorWebFormsComponents.Test/GridView/TemplateFields.razor
+++ b/src/BlazorWebFormsComponents.Test/GridView/TemplateFields.razor
@@ -23,21 +23,24 @@
 
 @code {
 
-		void FirstTest()
-		{
-			var cut = GetComponentUnderTest();
-			var tableHeaders = cut.FindAll("th");
-			tableHeaders[0].TextContent.ShouldBe("Name");
-			tableHeaders[1].TextContent.ShouldBe("Price");
-			tableHeaders.Count.ShouldBe(2, "Did not render 2 TH elements");
-			cut.FindAll("tr").Count(e => e.InnerHtml.Contains("td")).ShouldBe(3, "Did not render 3 TR elements");
-			cut.FindAll("td").Count(e => e.InnerHtml.Contains("label")).ShouldBe(3, "Did not render 3 labels");
-			cut.FindAll("td").Count(e => e.InnerHtml.Contains("button")).ShouldBe(3, "Did not render 3 buttons");
-		}
+	void FirstTest()
+	{
+		var cut = GetComponentUnderTest();
 
-		IQueryable<Widget> GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
-		{
-			totalRowCount = Widget.SimpleWidgetList.Length;
-			return Widget.SimpleWidgetList.AsQueryable();
-		}
+		System.Diagnostics.Debug.WriteLine(cut.Markup);
+		var tableHeaders = cut.FindAll("th");
+		tableHeaders[0].TextContent.ShouldBe("Name");
+		tableHeaders[1].TextContent.ShouldBe("Price");
+		tableHeaders.Count.ShouldBe(2, "Did not render 2 TH elements");
+		cut.FindAll("tr").Count(e => e.InnerHtml.Contains("td")).ShouldBe(3, "Did not render 3 TR elements");
+		cut.FindAll("td").Count(e => e.InnerHtml.Contains("label")).ShouldBe(3, "Did not render 3 labels");
+		cut.FindAll("td").Count(e => e.InnerHtml.Contains("button")).ShouldBe(3, "Did not render 3 buttons");
+	}
+
+	IQueryable<Widget>
+	GetWidgets(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
+	{
+		totalRowCount = Widget.SimpleWidgetList.Length;
+		return Widget.SimpleWidgetList.AsQueryable();
+	}
 }
diff --git a/src/BlazorWebFormsComponents/BaseColumn.cs b/src/BlazorWebFormsComponents/BaseColumn.cs
index d6b06ba..ad4d3a2 100644
--- a/src/BlazorWebFormsComponents/BaseColumn.cs
+++ b/src/BlazorWebFormsComponents/BaseColumn.cs
@@ -3,24 +3,10 @@
 
 namespace BlazorWebFormsComponents
 {
-  public abstract class BaseColumn : BaseWebFormsComponent, IColumn
+	public abstract class BaseColumn : BaseWebFormsComponent
 	{
-		///<inheritdoc/>
-		[CascadingParameter(Name = "ColumnCollection")]
-		public IColumnCollection ParentColumnsCollection { get; set; }
-
-		///<inheritdoc/>
 		[Parameter] public string HeaderText { get; set; }
 
-		public void Dispose()
-		{
-			ParentColumnsCollection.RemoveColumn(this);
-		}
 
-		///<inheritdoc/>
-		protected override void OnInitialized()
-		{
-			ParentColumnsCollection.AddColumn(this);
-		}
 	}
 }
diff --git a/src/BlazorWebFormsComponents/BaseRow.cs b/src/BlazorWebFormsComponents/BaseRow.cs
deleted file mode 100644
index 78846e9..0000000
--- a/src/BlazorWebFormsComponents/BaseRow.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using BlazorWebFormsComponents.Interfaces;
-using Microsoft.AspNetCore.Components;
-
-namespace BlazorWebFormsComponents
-{
-	/// <summary>
-	/// Base abstract row class
-	/// </summary>
-  public abstract class BaseRow : BaseWebFormsComponent, IRow
-  {
-		///<inheritdoc/>
-		[CascadingParameter(Name = "RowCollection")] public IRowCollection RowCollection { get; set; }
-
-		///<inheritdoc/>
-		[Parameter] public object DataItem { get; set; }
-
-		public void Dispose()
-		{
-			RowCollection.RemoveRow(this);
-		}
-
-		///<inheritdoc/>
-		protected override void OnInitialized()
-		{
-			RowCollection.AddRow(this);
-		}
-	}
-}
diff --git a/src/BlazorWebFormsComponents/GridView.razor b/src/BlazorWebFormsComponents/GridView.razor
index 752fbf4..13791ec 100644
--- a/src/BlazorWebFormsComponents/GridView.razor
+++ b/src/BlazorWebFormsComponents/GridView.razor
@@ -1,39 +1,23 @@
-@typeparam ItemType
-@inherits BaseModelBindingComponent<ItemType>
-@using Interfaces
-@if (ColumnList.Any())
-{
-	<table class="@CssClass">
+@inherits ListView<ItemType>
+@typeparam ItemType
+<ListView runat="server"
+					ItemType="ItemType"
+					Context="Item"
+					Items="@Items">
+	<ItemTemplate><tr></tr></ItemTemplate>
+	<LayoutTemplate Context="itemPlaceHolder">
+		<table class="table" id="gridview">
 			<thead>
-				<tr>
-					@foreach (IColumn column in ColumnList)
-					{
-						<th>@column.HeaderText</th>
-					}
-				</tr>
-			</thead>
-			<tbody>
-				@if (Items != null && Items.Any())
+				@foreach (var h in HeaderRow())
 				{
-					@foreach (ItemType item in Items)
-					{
-						<CascadingValue Value="this" Name="RowCollection">
-							<GridViewRow DataItem="item" Columns="ColumnList" />
-						</CascadingValue>
-					}
-				}
-				else
-				{
-					<tr>
-						<td colspan=@ColumnList.Count>
-							@EmptyDataText
-						</td>
-					</tr>
-				}
-			</tbody>	
-	</table>
-}
-
-<CascadingValue Value="this" Name="ColumnCollection">
-	@Columns
-</CascadingValue>
+				<th>@h</th>
+			}
+				</thead>
+				<tbody>
+					@itemPlaceHolder
+				</tbody>
+			</table>
+		</LayoutTemplate>
+	</ListView>
+	@code{
+	}
diff --git a/src/BlazorWebFormsComponents/GridView.razor.cs b/src/BlazorWebFormsComponents/GridView.razor.cs
index bf3250e..c0f22d7 100644
--- a/src/BlazorWebFormsComponents/GridView.razor.cs
+++ b/src/BlazorWebFormsComponents/GridView.razor.cs
@@ -1,6 +1,6 @@
-using BlazorWebFormsComponents.Interfaces;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace BlazorWebFormsComponents
 {
@@ -8,14 +8,26 @@ namespace BlazorWebFormsComponents
 	/// Blazor version of WebForms GridView control
 	/// </summary>
 	/// <typeparam name="ItemType"></typeparam>
-  public partial class GridView<ItemType> : BaseModelBindingComponent<ItemType>, IRowCollection, IColumnCollection
-  {
+	public partial class GridView<ItemType> : ListView<ItemType>
+	{
 
 		/// <summary>
 		///	Specify if the GridView component will autogenerate its columns
 		/// </summary>
 		[Parameter] public bool AutogenerateColumns { get; set; } = true;
 
+		[Parameter] public RenderFragment Columns { get; set; }
+
+		public List<BoundField> BoundFields { get; set; } = new List<BoundField>();
+
+		public IEnumerable<string> HeaderRow()
+		{
+			foreach (var x in BoundFields)
+			{
+				yield return x.HeaderText;
+			}
+		}
+
 		/// <summary>
 		/// Text to show when there are no items to show
 		/// </summary>
@@ -32,26 +44,8 @@ public partial class GridView<ItemType> : BaseModelBindingComponent<ItemType>, I
 		[Parameter] public string CssClass { get; set; }
 
 		///<inheritdoc/>
-		public List<IColumn> ColumnList { get; set; } = new List<IColumn>();
-
-		/// <summary>
-		/// The Rows of the GridView
-		/// </summary>
-		public List<IRow> Rows { get => RowList; set => RowList = value; }
-
-		///<inheritdoc/>
-		public List<IRow> RowList { get; set; } = new List<IRow>();
 
 		#region Templates
-		/// <summary>
-		/// The columns template of the GridView
-		/// </summary>
-		[Parameter] public RenderFragment Columns { get; set; }
-
-		/// <summary>
-		/// The ChildContent of the GridView
-		/// </summary>
-		[Parameter] public RenderFragment ChildContent { get; set; }
 		#endregion
 		protected override void OnInitialized()
 		{
@@ -61,34 +55,5 @@ protected override void OnInitialized()
 				GridViewColumnGenerator.GenerateColumns(this);
 			}
 		}
-
-		///<inheritdoc/>
-		public void AddColumn(IColumn column)
-		{
-			ColumnList.Add(column);
-			StateHasChanged();
-		}
-
-		///<inheritdoc/>
-		public void RemoveColumn(IColumn column)
-		{
-			ColumnList.Remove(column);
-			StateHasChanged();
-		}
-
-		///<inheritdoc/>
-		public void RemoveRow(IRow row)
-		{
-			Rows.Remove(row);
-			StateHasChanged();
-		}
-
-		///<inheritdoc/>
-		public void AddRow(IRow row)
-		{
-			Rows.Add(row);
-			StateHasChanged();
-		}
-
 	}
 }
diff --git a/src/BlazorWebFormsComponents/GridViewColumnGenerator.cs b/src/BlazorWebFormsComponents/GridViewColumnGenerator.cs
index 810be5a..c64ae7d 100644
--- a/src/BlazorWebFormsComponents/GridViewColumnGenerator.cs
+++ b/src/BlazorWebFormsComponents/GridViewColumnGenerator.cs
@@ -6,8 +6,8 @@ namespace BlazorWebFormsComponents
 	/// <summary>
 	/// The GridView Column Generator
 	/// </summary>
-  public static class GridViewColumnGenerator
-  {
+	public static class GridViewColumnGenerator
+	{
 		/// <summary>
 		/// Generate columns for a given GridView based on the properties of given Type
 		/// </summary>
@@ -19,12 +19,13 @@ public static void GenerateColumns<ItemType>(GridView<ItemType> gridView)
 			var propertiesInfo = type.GetProperties(BindingFlags.Instance | BindingFlags.Public).OrderBy(x => x.MetadataToken);
 			foreach (var propertyInfo in propertiesInfo)
 			{
-				var newColumn = new BoundField {
+				var newColumn = new BoundField
+				{
 					DataField = propertyInfo.Name,
-					ParentColumnsCollection = gridView,
-					HeaderText = propertyInfo.Name
+					HeaderText = propertyInfo.Name,
 				};
-				gridView.ColumnList.Add(newColumn);
+				gridView.BoundFields.Add(newColumn);
+
 			}
 		}
 	}
diff --git a/src/BlazorWebFormsComponents/GridViewRow.razor b/src/BlazorWebFormsComponents/GridViewRow.razor
deleted file mode 100644
index c7a2fa6..0000000
--- a/src/BlazorWebFormsComponents/GridViewRow.razor
+++ /dev/null
@@ -1,37 +0,0 @@
-@inherits BaseRow
-@using Interfaces
-
-<tr @key="DataItem">
-	@foreach (IColumn column in Columns)
-	{
-	<td @key="column">
-		@if (column is BoundField)
-		{
-			var datafield = (BoundField)column;
-			var properties = datafield.DataField.Split('.');
-			object obj = DataItem;
-			@foreach (var property in properties)
-			{
-
-				var propertyInfo = obj.GetType().GetProperty(property);
-				obj = propertyInfo.GetValue(obj);
-			}
-			if (datafield.DataFormatString != null)
-			{
-				@String.Format(datafield.DataFormatString, @obj.ToString())
-			}
-			else
-			{
-				@obj.ToString();
-			}
-		}
-		else
-		{
-			var templateField = (TemplateField)column;
-			@templateField.ItemTemplate(DataItem)
-
-		}
-	</td>
-	}
-</tr>
-
diff --git a/src/BlazorWebFormsComponents/GridViewRow.razor.cs b/src/BlazorWebFormsComponents/GridViewRow.razor.cs
deleted file mode 100644
index a00aa3f..0000000
--- a/src/BlazorWebFormsComponents/GridViewRow.razor.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using BlazorWebFormsComponents.Interfaces;
-using Microsoft.AspNetCore.Components;
-using System.Collections.Generic;
-
-namespace BlazorWebFormsComponents
-{ 
-	/// <summary>
-	/// The row of a GridView
-	/// </summary>
-  public partial class GridViewRow: BaseRow
-	{
-
-		/// <summary>
-		/// The data item Index
-		/// </summary>
-    [Parameter] public int DataItemIndex { get; set; }
-
-		/// <summary>
-		/// The row index
-		/// </summary>
-    [Parameter] public int RowIndex { get; set; }
-
-		/// <summary>
-		/// The columns of the Row
-		/// </summary>
-		[Parameter] public List<IColumn> Columns { get; set; }
-
-	}
-}
diff --git a/src/BlazorWebFormsComponents/Interfaces/IColumn.cs b/src/BlazorWebFormsComponents/Interfaces/IColumn.cs
deleted file mode 100644
index 23b25be..0000000
--- a/src/BlazorWebFormsComponents/Interfaces/IColumn.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace BlazorWebFormsComponents.Interfaces
-{
-	/// <summary>
-	/// Generic column interface
-	/// </summary>
-  public interface IColumn
-  {
-		/// <summary>
-		/// The header text of the column
-		/// </summary>
-		string HeaderText { get; set; }
-
-		/// <summary>
-		/// The parent IColumnCollection where the IColumn resides
-		/// </summary>
-		IColumnCollection ParentColumnsCollection { get; set; }
-	}
-}
diff --git a/src/BlazorWebFormsComponents/Interfaces/IColumnCollection.cs b/src/BlazorWebFormsComponents/Interfaces/IColumnCollection.cs
deleted file mode 100644
index 1283248..0000000
--- a/src/BlazorWebFormsComponents/Interfaces/IColumnCollection.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BlazorWebFormsComponents.Interfaces
-{
-	/// <summary>
-	/// Generic column collection interface
-	/// </summary>
-  public interface IColumnCollection
-  {
-		/// <summary>
-		/// The list of IColumns
-		/// </summary>
-		List<IColumn> ColumnList { get; set; }
-
-		/// <summary>
-		/// Adds an IColumn to the collection
-		/// </summary>
-		/// <param name="column"></param>
-		void AddColumn(IColumn column);
-
-		/// <summary>
-		/// Removes an IColumn from the collection
-		/// </summary>
-		/// <param name="column"></param>
-		void RemoveColumn(IColumn column);
-	}
-}
diff --git a/src/BlazorWebFormsComponents/Interfaces/IRow.cs b/src/BlazorWebFormsComponents/Interfaces/IRow.cs
deleted file mode 100644
index 2bc0cd2..0000000
--- a/src/BlazorWebFormsComponents/Interfaces/IRow.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace BlazorWebFormsComponents.Interfaces
-{
-	/// <summary>
-	/// Generic row interface
-	/// </summary>
-  public interface IRow
-  {
-		/// <summary>
-		/// The parent IRowCollection where the IRow resides
-		/// </summary>
-		IRowCollection RowCollection { get; set; }
-
-		/// <summary>
-		/// The object bound to the row
-		/// </summary>
-		object DataItem { get; set; }
-	}
-}
diff --git a/src/BlazorWebFormsComponents/Interfaces/IRowCollection.cs b/src/BlazorWebFormsComponents/Interfaces/IRowCollection.cs
deleted file mode 100644
index 5f9281b..0000000
--- a/src/BlazorWebFormsComponents/Interfaces/IRowCollection.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BlazorWebFormsComponents.Interfaces
-{
-	/// <summary>
-	/// Generic collection of IRow
-	/// </summary>
-  public interface IRowCollection
-  {
-		/// <summary>
-		/// The list of IRows
-		/// </summary>
-		List<IRow> RowList { get; set; }
-
-		/// <summary>
-		/// Adds a IRow to the collection
-		/// </summary>
-		/// <param name="row"></param>
-		void AddRow(IRow row);
-
-		/// <summary>
-		/// Deletes an IRow from the collection
-		/// </summary>
-		/// <param name="row"></param>
-		void RemoveRow(IRow row);
-	}
-}
diff --git a/src/BlazorWebFormsComponents/ListView.razor.cs b/src/BlazorWebFormsComponents/ListView.razor.cs
index e7e72d5..616e5e6 100644
--- a/src/BlazorWebFormsComponents/ListView.razor.cs
+++ b/src/BlazorWebFormsComponents/ListView.razor.cs
@@ -23,7 +23,7 @@ public ListView()
 		[Parameter] public RenderFragment GroupSeparatorTemplate { get; set; }
 		[Parameter] public RenderFragment<RenderFragment> GroupTemplate { get; set; }
 		[Parameter] public RenderFragment ItemPlaceHolder { get; set; }
-				/// <summary>
+		/// <summary>
 		/// 🚨🚨 LayoutTemplate is not available.  Please wrap the ListView component with the desired layout 🚨🚨
 		/// </summary>
 		[Parameter]
diff --git a/src/BlazorWebFormsComponents/TemplateField.razor.cs b/src/BlazorWebFormsComponents/TemplateField.razor.cs
index 8790300..7481d6c 100644
--- a/src/BlazorWebFormsComponents/TemplateField.razor.cs
+++ b/src/BlazorWebFormsComponents/TemplateField.razor.cs
@@ -5,11 +5,11 @@ namespace BlazorWebFormsComponents
 	/// <summary>
 	/// A template field column
 	/// </summary>
-	public partial class TemplateField: BaseColumn
+	public partial class TemplateField : BaseColumn
 	{
 		/// <summary>
 		/// The item template
 		/// </summary>
-		[Parameter] public RenderFragment<dynamic> ItemTemplate { get; set; }
+		[Parameter] public RenderFragment<string> ItemTemplate { get; set; }
 	}
 }