diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
index a7d1de5777..dd7cf3bf1d 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizer.cs
@@ -10,29 +10,88 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Presenters
 {
+    /// <summary>
+    /// Base class for classes which handle virtualization for an <see cref="ItemsPresenter"/>.
+    /// </summary>
     internal abstract class ItemVirtualizer
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemVirtualizer"/> class.
+        /// </summary>
+        /// <param name="owner"></param>
         public ItemVirtualizer(ItemsPresenter owner)
         {
             Owner = owner;
         }
 
+        /// <summary>
+        /// Gets the <see cref="ItemsPresenter"/> which owns the virtualizer.
+        /// </summary>
         public ItemsPresenter Owner { get; }
+
+        /// <summary>
+        /// Gets the <see cref="IVirtualizingPanel"/> which will host the items.
+        /// </summary>
         public IVirtualizingPanel VirtualizingPanel => Owner.Panel as IVirtualizingPanel;
+
+        /// <summary>
+        /// Gets the items to display.
+        /// </summary>
         public IEnumerable Items { get; private set; }
+
+        /// <summary>
+        /// Gets the number of items in <see cref="Items"/>.
+        /// </summary>
         public int ItemCount { get; private set; }
-        public int FirstIndex { get; set; }
-        public int NextIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the first item displayed in the panel.
+        /// </summary>
+        public int FirstIndex { get; protected set; }
+
+        /// <summary>
+        /// Gets or sets the index of the first item beyond those displayed in the panel.
+        /// </summary>
+        public int NextIndex { get; protected set; }
+
+        /// <summary>
+        /// Gets a value indicating whether the items should be scroll horizontally or vertically.
+        /// </summary>
         public bool Vertical => VirtualizingPanel.ScrollDirection == Orientation.Vertical;
 
+        /// <summary>
+        /// Gets a value indicating whether logical scrolling is enabled.
+        /// </summary>
         public abstract bool IsLogicalScrollEnabled { get; }
+
+        /// <summary>
+        /// Gets the value of the scroll extent.
+        /// </summary>
         public abstract double ExtentValue { get; }
+
+        /// <summary>
+        /// Gets or sets the value of the current scroll offset.
+        /// </summary>
         public abstract double OffsetValue { get; set; }
+
+        /// <summary>
+        /// Gets the value of the scrollable viewport.
+        /// </summary>
         public abstract double ViewportValue { get; }
 
+        /// <summary>
+        /// Gets the <see cref="ExtentValue"/> as a <see cref="Size"/>.
+        /// </summary>
         public Size Extent => Vertical ? new Size(0, ExtentValue) : new Size(ExtentValue, 0);
+
+        /// <summary>
+        /// Gets the <see cref="ViewportValue"/> as a <see cref="Size"/>.
+        /// </summary>
         public Size Viewport => Vertical ? new Size(0, ViewportValue) : new Size(ViewportValue, 0);
 
+        /// <summary>
+        /// Gets or sets the <see cref="OffsetValue"/> as a <see cref="Vector"/>.
+        /// </summary>
         public Vector Offset
         {
             get
@@ -46,6 +105,12 @@ namespace Avalonia.Controls.Presenters
             }
         }
         
+        /// <summary>
+        /// Creates an <see cref="ItemVirtualizer"/> based on an item presenter's 
+        /// <see cref="ItemVirtualizationMode"/>.
+        /// </summary>
+        /// <param name="owner">The items presenter.</param>
+        /// <returns>An <see cref="ItemVirtualizer"/>.</returns>
         public static ItemVirtualizer Create(ItemsPresenter owner)
         {
             var virtualizingPanel = owner.Panel as IVirtualizingPanel;
@@ -63,13 +128,30 @@ namespace Avalonia.Controls.Presenters
             return new ItemVirtualizerNone(owner);
         }
 
+        /// <summary>
+        /// Called by the <see cref="Owner"/> when it carries out an arrange.
+        /// </summary>
+        /// <param name="finalSize">The final size passed to the arrange.</param>
         public abstract void Arranging(Size finalSize);
 
+        /// <summary>
+        /// Called when a request is made to bring an item into view.
+        /// </summary>
+        /// <param name="target">The item to bring into view.</param>
+        /// <param name="targetRect">The rect on the item to bring into view.</param>
+        /// <returns>True if the request was handled; otherwise false.</returns>
         public virtual bool BringIntoView(IVisual target, Rect targetRect)
         {
             return false;
         }
 
+        /// <summary>
+        /// Called when the items for the presenter change, either because 
+        /// <see cref="ItemsPresenterBase.Items"/> has been set, the items collection has been
+        /// modified, or the panel has been created.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="e">A description of the change.</param>
         public virtual void ItemsChanged(IEnumerable items, NotifyCollectionChangedEventArgs e)
         {
             Items = items;
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
index a8c24fcf72..303c7442c2 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerNone.cs
@@ -10,6 +10,10 @@ using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls.Presenters
 {
+    /// <summary>
+    /// Represents an item virtualizer for an <see cref="ItemsPresenter"/> that doesn't actually
+    /// virtualize items - it just creates a container for every item.
+    /// </summary>
     internal class ItemVirtualizerNone : ItemVirtualizer
     {
         public ItemVirtualizerNone(ItemsPresenter owner)
@@ -17,29 +21,44 @@ namespace Avalonia.Controls.Presenters
         {
         }
 
+        /// <inheritdoc/>
         public override bool IsLogicalScrollEnabled => false;
 
+        /// <summary>
+        /// This property should never be accessed because <see cref="IsLogicalScrollEnabled"/> is
+        /// false.
+        /// </summary>
         public override double ExtentValue
         {
             get { throw new NotSupportedException(); }
         }
 
+        /// <summary>
+        /// This property should never be accessed because <see cref="IsLogicalScrollEnabled"/> is
+        /// false.
+        /// </summary>
         public override double OffsetValue
         {
             get { throw new NotSupportedException(); }
             set { throw new NotSupportedException(); }
         }
 
+        /// <summary>
+        /// This property should never be accessed because <see cref="IsLogicalScrollEnabled"/> is
+        /// false.
+        /// </summary>
         public override double ViewportValue
         {
             get { throw new NotSupportedException(); }
         }
 
+        /// <inheritdoc/>
         public override void Arranging(Size finalSize)
         {
             // We don't need to do anything here.
         }
 
+        /// <inheritdoc/>
         public override void ItemsChanged(IEnumerable items, NotifyCollectionChangedEventArgs e)
         {
             base.ItemsChanged(items, e);
@@ -47,7 +66,6 @@ namespace Avalonia.Controls.Presenters
             var generator = Owner.ItemContainerGenerator;
             var panel = Owner.Panel;
 
-            // TODO: Handle Move and Replace etc.
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
@@ -77,7 +95,9 @@ namespace Avalonia.Controls.Presenters
                     break;
 
                 case NotifyCollectionChangedAction.Move:
-                // TODO: Implement Move in a more efficient manner.
+                    // TODO: Handle move in a more efficient manner. At the moment we just
+                    // drop through to Reset to recreate all the containers.
+
                 case NotifyCollectionChangedAction.Reset:
                     RemoveContainers(generator.Clear());
 
diff --git a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
index 01b1b24e43..69141fdbea 100644
--- a/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
+++ b/src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs
@@ -10,17 +10,28 @@ using Avalonia.Controls.Utils;
 
 namespace Avalonia.Controls.Presenters
 {
+    /// <summary>
+    /// Handles virtualization in an <see cref="ItemsPresenter"/> for
+    /// <see cref="ItemVirtualizationMode.Simple"/>.
+    /// </summary>
     internal class ItemVirtualizerSimple : ItemVirtualizer
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemVirtualizerSimple"/> class.
+        /// </summary>
+        /// <param name="owner"></param>
         public ItemVirtualizerSimple(ItemsPresenter owner)
             : base(owner)
         {
         }
 
+        /// <inheritdoc/>
         public override bool IsLogicalScrollEnabled => true;
 
+        /// <inheritdoc/>
         public override double ExtentValue => ItemCount;
 
+        /// <inheritdoc/>
         public override double OffsetValue
         {
             get
@@ -61,6 +72,7 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <inheritdoc/>
         public override double ViewportValue
         {
             get
@@ -71,12 +83,14 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <inheritdoc/>
         public override void Arranging(Size finalSize)
         {
             CreateAndRemoveContainers();
             ((ILogicalScrollable)Owner).InvalidateScroll();
         }
 
+        /// <inheritdoc/>
         public override void ItemsChanged(IEnumerable items, NotifyCollectionChangedEventArgs e)
         {
             base.ItemsChanged(items, e);
@@ -123,6 +137,10 @@ namespace Avalonia.Controls.Presenters
             ((ILogicalScrollable)Owner).InvalidateScroll();
         }
 
+        /// <summary>
+        /// Creates and removes containers such that we have at most enough containers to fill
+        /// the panel.
+        /// </summary>
         private void CreateAndRemoveContainers()
         {
             var generator = Owner.ItemContainerGenerator;
@@ -184,6 +202,14 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <summary>
+        /// Updates the containers in the panel to make sure they are displaying the correct item
+        /// based on <see cref="ItemVirtualizer.FirstIndex"/>.
+        /// </summary>
+        /// <remarks>
+        /// This method requires that <see cref="ItemVirtualizer.FirstIndex"/> + the number of
+        /// materialized containers is not more than <see cref="ItemVirtualizer.ItemCount"/>.
+        /// </remarks>
         private void RecycleContainers()
         {
             var panel = VirtualizingPanel;
@@ -208,6 +234,19 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <summary>
+        /// Recycles containers when a move occurs.
+        /// </summary>
+        /// <param name="delta">The delta of the move.</param>
+        /// <remarks>
+        /// If the move is less than a page, then this method moves the containers for the items
+        /// that are still visible to the correct place, and recyles and moves the others. For
+        /// example: if there are 20 items and 10 containers visible and the user scrolls 5
+        /// items down, then the bottom 5 containers will be moved to the top and the top 5 will
+        /// be moved to the bottom and recycled to display the newly visible item. Updates 
+        /// <see cref="ItemVirtualizer.FirstIndex"/> and <see cref="ItemVirtualizer.NextIndex"/>
+        /// with their new values.
+        /// </remarks>
         private void RecycleContainersForMove(int delta)
         {
             var panel = VirtualizingPanel;
@@ -250,6 +289,9 @@ namespace Avalonia.Controls.Presenters
             NextIndex += delta;
         }
 
+        /// <summary>
+        /// Recycles containers due to items being removed.
+        /// </summary>
         private void RecycleContainersOnRemove()
         {
             var panel = VirtualizingPanel;
@@ -283,6 +325,11 @@ namespace Avalonia.Controls.Presenters
             }
         }
 
+        /// <summary>
+        /// Removes the specified number of containers from the end of the panel and updates
+        /// <see cref="ItemVirtualizer.NextIndex"/>.
+        /// </summary>
+        /// <param name="count">The number of containers to remove.</param>
         private void RemoveContainers(int count)
         {
             var index = VirtualizingPanel.Children.Count - count;