diff --git a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/ViewController.cs b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/ViewController.cs
index b91a2e3d..44b1e283 100644
--- a/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/ViewController.cs
+++ b/csharp/Facebook.Yoga/mac/Facebook.Yoga.Mac.Test/ViewController.cs
@@ -1,4 +1,5 @@
-using System;
+//#define DEBUG_LAYOUT
+using System;
 
 using AppKit;
 using Foundation;
@@ -8,14 +9,34 @@ namespace Facebook.Yoga.Mac.Test
 {
 	public static class NSViewYogaExtensions
 	{
-		public static void ApplyYogaLayout(this NSView view, YogaNode n)
+		public static void ApplyYogaLayout (this NSView view, YogaNode n, bool root = true)
 		{
-			view.Frame = new CGRect(n.LayoutX, n.LayoutY, n.LayoutWidth, n.LayoutHeight);
+#if DEBUG_LAYOUT
+			Console.WriteLine ($"ApplyYogaLayout {view.ToolTip}, {n.LayoutX}, {n.LayoutY}, {n.LayoutWidth}, {n.LayoutHeight}");
+#endif
+
+			// A bit of gross special casing
+			// This really should mostly go away if/when the UIView+Yoga.m magic gets ported to AppKit
+			if (root)
+				view.Frame = new CGRect (n.LayoutX, n.LayoutY, n.LayoutWidth, n.LayoutHeight);
+#if DEBUG_LAYOUT
+			Console.WriteLine ($"Setting {view.ToolTip} frame to {view.Frame}");
+#endif
+
 			// This assumes your YogaNode and NSView children were inserted in same order
 			for (int i = 0; i < n.Count; ++i) {
 				YogaNode childNode = n[i];
 				// Cocoa coord space is from bottom left not top left
 				view.Subviews[i].Frame = new CGRect (childNode.LayoutX, n.LayoutHeight - childNode.LayoutY - childNode.LayoutHeight, childNode.LayoutWidth, childNode.LayoutHeight);
+#if DEBUG_LAYOUT
+				Console.WriteLine ($"Setting {view.Subviews[i].ToolTip} frame to {view.Subviews[i].Frame}");
+#endif
+				if (childNode.Count > 0){
+#if DEBUG_LAYOUT
+					Console.WriteLine ($"Calling ApplyYogaLayout recursively on {view.Subviews[i].ToolTip}");
+#endif
+					ApplyYogaLayout (view.Subviews[i], childNode, false);
+				}
 			}
 		}
 	}
@@ -33,8 +54,7 @@ namespace Facebook.Yoga.Mac.Test
 			NSImage image = NSImage.ImageNamed (NSImageName.TrashFull);
 
 			NSView root = CreateViewHierarchy (image);
-
-			var rootNode = CalculateLayout (image.Size);
+			var rootNode = CalculateLayout (View.Frame, image.Size);
 
 			root.ApplyYogaLayout (rootNode);
 
@@ -43,41 +63,64 @@ namespace Facebook.Yoga.Mac.Test
 
 		static NSView CreateViewHierarchy (NSImage image)
 		{
-			var root = new NSView ();
-			NSImageView imageView = new NSImageView () {
-				Image = image
+			var root = new NSView () {
+				WantsLayer = true,
+				ToolTip = "Root"
 			};
-			root.AddSubview (imageView);
+			root.Layer.BackgroundColor = NSColor.Red.CGColor;
 
-			NSTextView text = new NSTextView () {
-				Value = "Hello World",
+			NSView child1 = new NSView () {
+				WantsLayer = true,
+				ToolTip = "Child 1"
 			};
-			root.AddSubview (text);
+			child1.Layer.BackgroundColor = NSColor.Blue.CGColor;
+
+			NSView child2 = new NSView () {
+				WantsLayer = true,
+				ToolTip = "Child 2"
+			};
+			child2.Layer.BackgroundColor = NSColor.Green.CGColor;
+
+			NSView child3 = new NSView () {
+				WantsLayer = true,
+				ToolTip = "Child 3"
+			};
+			child3.Layer.BackgroundColor = NSColor.Yellow.CGColor;
+
+			root.AddSubview (child1);
+			root.AddSubview (child2);
+			child2.AddSubview (child3);
+
 			return root;
 		}
 
-		static YogaNode CalculateLayout (CGSize imageSize)
+		static YogaNode CalculateLayout (CGRect rootFrame, CGSize imageSize)
 		{
 			var rootNode = new YogaNode () {
-				Width = 400,
-				Height = 120,
-				FlexDirection = YogaFlexDirection.Row
+				Width = (float)rootFrame.Width,
+				Height = (float)rootFrame.Height,
+				AlignItems = YogaAlign.Center,
+				JustifyContent = YogaJustify.Center
 			};
-			rootNode.SetPadding (YogaEdge.All, 20);
 
-			var imageNode = new YogaNode () {
-				Width = (float)imageSize.Width,
-				Height = (float)imageSize.Height,
+			var child1Node = new YogaNode () {
+				Width = 100,
+				Height = 100
 			};
-			imageNode.SetMargin (YogaEdge.End, 20);
 
-			var textNode = new YogaNode () {
-				AlignSelf = YogaAlign.Center,
-				FlexGrow = 1,
-				Height = 60,
+			var child2Node = new YogaNode () {
+				Width = 200,
+				Height = 100
 			};
-			rootNode.Insert (0, imageNode);
-			rootNode.Insert (1, textNode);
+
+			var child3Node = new YogaNode () {
+				Width = 100,
+				Height = 100
+			};
+
+			rootNode.Insert (0, child1Node);
+			rootNode.Insert (1, child2Node);
+			child2Node.Insert (0, child3Node);
 			rootNode.CalculateLayout ();
 
 			return rootNode;