diff --git a/demos/draggable/constrain-movement.html b/demos/draggable/constrain-movement.html
new file mode 100644
index 000000000..fbfea8009
--- /dev/null
+++ b/demos/draggable/constrain-movement.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Draggable - Axis Demo</title>
+	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.3.js"></script>
+	<script type="text/javascript" src="../../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<style type="text/css">
+	#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 5px; }
+	#draggable { cursor: n-resize; }
+	#draggable2 { cursor: e-resize; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable({ axis: 'y' });
+		$("#draggable2").draggable({ axis: 'x' });
+	});
+	</script>
+</head>
+<body>
+<div class="demo">
+	
+<div id="draggable" class="ui-widget-content">
+	<p>I can be dragged only vertically</p>
+</div>
+
+<div id="draggable2" class="ui-widget-content">
+	<p>I can be dragged only horizontally</p>
+</div>
+
+<!-- ADD CONTAINMENT EXAMPLE -->
+
+</div><!-- End demo -->
+
+<div class="demo-description">
+
+<p>
+Define the boundaries of the draggable area. Set the <strong>axis</strong> option to limit the draggable's path to the x- or y-axis. Or use the <strong>containment</strong> option to specify a parent DOM element or a jQuery selector, like 'document.'
+</p>
+
+</div><!-- End demo-description -->
+</body>
+</html>
diff --git a/demos/draggable/handle.html b/demos/draggable/handle.html
index 9acfa2a7d..ea53c09b8 100644
--- a/demos/draggable/handle.html
+++ b/demos/draggable/handle.html
@@ -24,6 +24,8 @@
 	<p class="ui-widget-header">I can be dragged only by this handle</p>
 </div>
 
+<!-- ADD CANCEL DEMO -->
+
 </div><!-- End demo -->
 
 <div class="demo-description">
diff --git a/demos/draggable/index.html b/demos/draggable/index.html
index ec47a7822..d4c927193 100644
--- a/demos/draggable/index.html
+++ b/demos/draggable/index.html
@@ -9,24 +9,38 @@
 <div class="demos-nav">
 	<h4>Examples</h4>
 	<ul>
-		<li class="demo-config-on"><a href="default.html">Default Draggable</a></li>
-		<li><a href="axis.html">Axis</a></li>
-		<li><a href="cancel.html">Cancel</a></li>
-		<li><a href="containment.html">Containment</a></li>
-		<li><a href="cursorat.html">Cursor at</a></li>
-		<li><a href="delaydistance.html">Delay / Distance</a></li>
+		<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
 		<li><a href="events.html">Events</a></li>
-		<li><a href="grid.html">Grid</a></li>
-		<li><a href="handle.html">Handle</a></li>
-		<li><a href="helper.html">Helper</a></li>
-		<li><a href="opacity.html">Opacity</a></li>
-		<li><a href="revert.html">Revert</a></li>
-		<li><a href="scroll.html">Scroll</a></li>
-		<li><a href="snap.html">Snap</a></li>
-		<li><a href="zindexstack.html">Z-Index / Stack</a></li>
-		<li><a href="sortable.html">Connected to sortable</a></li>
+		<li><a href="constrain-movement.html">Constrain movement</a></li>
+		<li><a href="delay-start.html">Delay start</a></li>
+		<li><a href="snap-to.html">Snap to grid or element</a></li>
+		<li><a href="scroll.html">Auto-scroll</a></li>
+		<li><a href="revert.html">Revert position</a></li>
+		<li><a href="visual-feedback.html">Visual feedback</a></li>
+		<li><a href="handle.html">Drag handle</a></li>
+		<li><a href="cursor-style.html">Cursor style</a></li>
+		<li><a href="sortable.html">Draggable + Sortable</a></li>
 	</ul>
 </div>
 
+<!--
+<li class="demo-config-on"><a href="default.html">Default Draggable</a></li>
+<li><a href="axis.html">Axis</a></li>
+<li><a href="cancel.html">Cancel</a></li>
+<li><a href="containment.html">Containment</a></li>
+<li><a href="cursorat.html">Cursor at</a></li>
+<li><a href="delaydistance.html">Delay / Distance</a></li>
+<li><a href="events.html">Events</a></li>
+<li><a href="grid.html">Grid</a></li>
+<li><a href="handle.html">Handle</a></li>
+<li><a href="helper.html">Helper</a></li>
+<li><a href="opacity.html">Opacity</a></li>
+<li><a href="revert.html">Revert</a></li>
+<li><a href="scroll.html">Scroll</a></li>
+<li><a href="snap.html">Snap</a></li>
+<li><a href="zindexstack.html">Z-Index / Stack</a></li>
+<li><a href="sortable.html">Connected to sortable</a></li>
+-->
+
 </body>
 </html>
diff --git a/demos/draggable/snap-to.html b/demos/draggable/snap-to.html
new file mode 100644
index 000000000..0f9c9a91d
--- /dev/null
+++ b/demos/draggable/snap-to.html
@@ -0,0 +1,70 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Draggable - Snap Demo</title>
+	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.3.js"></script>
+	<script type="text/javascript" src="../../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<style type="text/css">
+	#draggable, #draggable2, #draggable3, #draggable4, #draggable5 { width: 100px; height: 80px; padding: 5px; float: left; margin: 5px; font-size: .9em; }
+	.ui-widget-header p, .ui-widget-content p { margin: 0; }
+	#snaptarget { height: 140px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable({ snap: true });
+		$("#draggable2").draggable({ snap: '.ui-widget-header' });
+		$("#draggable3").draggable({ snap: '.ui-widget-header', snapMode: 'outer' });
+		$("#draggable4").draggable({ snap: '.ui-widget-header', snapMode: 'inner' });
+		$("#draggable5").draggable({ snap: '.ui-widget-header', snapTolerance: 50 });
+	});
+	</script>
+</head>
+<body>
+<div class="demo">
+	
+<div id="snaptarget" class="ui-widget-header">
+	<p>I'm a snap target</p>
+</div>
+
+<br clear="both" />
+
+<div id="draggable" class="ui-widget-content">
+	<p>Default (snap: true), snaps to all other draggable elements</p>
+</div>
+
+<div id="draggable2" class="ui-widget-content">
+	<p>I only snap to the big box</p>
+</div>
+
+<div id="draggable3" class="ui-widget-content">
+	<p>I only snap to the outer edges of the bix box</p>
+</div>
+
+<div id="draggable4" class="ui-widget-content">
+	<p>I only snap to the inner edges of the big box</p>
+</div>
+
+<div id="draggable5" class="ui-widget-content">
+	<p>I also snap to the big box but I'm very sticky because I have a high tolerance</p>
+</div>
+
+
+<!-- ADD GRID EXAMPLE -->
+
+</div><!-- End demo -->
+
+<div class="demo-description">
+
+<p>
+<!-- Add description here -->
+</p>
+
+</div><!-- End demo-description -->
+
+
+
+</body>
+</html>
diff --git a/demos/draggable/visual-feedback.html b/demos/draggable/visual-feedback.html
new file mode 100644
index 000000000..333560567
--- /dev/null
+++ b/demos/draggable/visual-feedback.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<title>jQuery UI Draggable - Helper Demo</title>
+	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
+	<script type="text/javascript" src="../../jquery-1.3.js"></script>
+	<script type="text/javascript" src="../../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<link type="text/css" href="../demos.css" rel="stylesheet" />
+	<style type="text/css">
+	#draggable, #draggable2, #draggable3 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 5px; }
+	</style>
+	<script type="text/javascript">
+	$(function() {
+		$("#draggable").draggable({ helper: 'original' });
+		$("#draggable2").draggable({ helper: 'clone' });
+		$("#draggable3").draggable({
+			cursor: 'move',
+			cursorAt: { top: -12, left: -20 },
+			helper: function(event) {
+				return $('<div class="ui-widget-header">I\'m a custom helper</div>');
+			}
+		});
+	});
+	</script>
+</head>
+<body>
+<div class="demo">
+
+<div id="draggable" class="ui-widget-content">
+	<p>Original</p>
+</div>
+
+<div id="draggable2" class="ui-widget-content">
+	<p>Clone</p>
+</div>
+
+<div id="draggable3" class="ui-widget-content">
+	<p>Custom helper (in combination with cursorAt)</p>
+</div>
+
+<!-- ADD EXAMPLES FOR OPACITY + ZINDEX/STACK -->
+
+</div><!-- End demo -->
+
+<div class="demo-description">
+
+<p>
+<!-- Add description here -->
+</p>
+
+</div><!-- End demo-description -->
+</body>
+</html>
