diff --git a/Classes/NJOutput.m b/Classes/NJOutput.m
index bf9e2e8..2bc723b 100644
--- a/Classes/NJOutput.m
+++ b/Classes/NJOutput.m
@@ -12,6 +12,7 @@
 #import "NJOutputMouseMove.h"
 #import "NJOutputMouseButton.h"
 #import "NJOutputMouseScroll.h"
+#import "NJOutputMouseDrag.h"
 
 @implementation NJOutput {
     BOOL running;
@@ -45,7 +46,8 @@ + (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
                         NJOutputMapping.class,
                         NJOutputMouseMove.class,
                         NJOutputMouseButton.class,
-                        NJOutputMouseScroll.class
+                        NJOutputMouseScroll.class,
+                        NJOutputMouseDrag.class
          ]) {
         if ([type isEqualToString:cls.serializationCode])
             return [cls outputWithSerialization:serialization];
diff --git a/Classes/NJOutputMouseDrag.h b/Classes/NJOutputMouseDrag.h
new file mode 100644
index 0000000..28ba9d8
--- /dev/null
+++ b/Classes/NJOutputMouseDrag.h
@@ -0,0 +1,16 @@
+//
+//  NJOutputMouseDrag.h
+//  Enjoyable
+//
+//  Created by Giovanni Muzzolini on 09/10/20.
+//
+
+#import "NJOutput.h"
+
+@interface NJOutputMouseDrag : NJOutput
+
+@property (nonatomic, assign) CGMouseButton button;
+@property (nonatomic, assign) int axis;
+@property (nonatomic, assign) float speed;
+
+@end
diff --git a/Classes/NJOutputMouseDrag.m b/Classes/NJOutputMouseDrag.m
new file mode 100644
index 0000000..5878356
--- /dev/null
+++ b/Classes/NJOutputMouseDrag.m
@@ -0,0 +1,108 @@
+//
+//  NJOutputMouseDrag.m
+//  Enjoyable
+//
+//  Created by Giovanni Muzzolini on 09/10/20.
+//
+
+#import "NJOutputMouseDrag.h"
+
+#import "NJInputController.h"
+
+@implementation NJOutputMouseDrag
+
++ (NSString *)serializationCode {
+    return @"mouse drag";
+}
+
+- (NSDictionary *)serialize {
+    return @{ @"type": self.class.serializationCode,
+              @"axis": @(_axis),
+              @"speed": @(_speed),
+              @"button": @(_button)
+              };
+}
+
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
+    NJOutputMouseDrag *output = [[NJOutputMouseDrag alloc] init];
+    output.axis = [serialization[@"axis"] intValue];
+    output.speed = [serialization[@"speed"] floatValue];
+    output.button = [serialization[@"button"] intValue];
+    if (output.speed == 0)
+        output.speed = 10;
+    return output;
+}
+
+- (BOOL)isContinuous {
+    return YES;
+}
+
+#define CLAMP(a, l, h) MIN(h, MAX(a, l))
+
+- (BOOL)update:(NJInputController *)ic {
+    
+    if (self.magnitude < 0.05)
+        return NO; // dead zone
+    
+    CGFloat height = NSScreen.mainScreen.frame.size.height;
+    NSPoint clickLoc = NSEvent.mouseLocation;
+    
+    if(!CGEventSourceButtonState(kCGEventSourceStateHIDSystemState, _button)){
+        
+        // trigger mouseDown
+        
+        CGEventType downEventType = _button == kCGMouseButtonLeft ? kCGEventLeftMouseDown
+        : _button == kCGMouseButtonRight ? kCGEventRightMouseDown
+        : kCGEventOtherMouseDown;
+        
+        CGEventRef down = CGEventCreateMouseEvent(NULL,
+                                                  downEventType,
+                                                  CGPointMake(clickLoc.x, height - clickLoc.y),
+                                                  _button);
+        CGEventSetIntegerValueField(down, kCGMouseEventClickState, 1);
+        CGEventPost(kCGHIDEventTap, down);
+        CFRelease(down);
+        
+    }
+    
+    CGSize size = NSScreen.mainScreen.frame.size;
+    
+    CGFloat dx = 0, dy = 0;
+    switch (_axis) {
+        case 0:
+            dx = -self.magnitude * _speed;
+            break;
+        case 1:
+            dx = self.magnitude * _speed;
+            break;
+        case 2:
+            dy = -self.magnitude * _speed;
+            break;
+        case 3:
+            dy = self.magnitude * _speed;
+            break;
+    }
+    NSPoint mouseLoc = ic.mouseLoc;
+    mouseLoc.x = CLAMP(mouseLoc.x + dx, 0, size.width - 1);
+    mouseLoc.y = CLAMP(mouseLoc.y - dy, 0, size.height - 1);
+    ic.mouseLoc = mouseLoc;
+    
+    // trigger mouseDrag
+    
+    CGEventType eventType = _button == kCGMouseButtonLeft ? kCGEventLeftMouseDragged
+                          : _button == kCGMouseButtonRight ? kCGEventRightMouseDragged
+                          : kCGEventOtherMouseDragged;
+    
+    CGEventRef drag = CGEventCreateMouseEvent(NULL, eventType,
+                                              CGPointMake(mouseLoc.x, size.height - mouseLoc.y),
+                                              _button);
+    CGEventSetIntegerValueField(drag, kCGMouseEventDeltaX, (int)dx);
+    CGEventSetIntegerValueField(drag, kCGMouseEventDeltaY, (int)dy);
+    CGEventPost(kCGHIDEventTap, drag);
+    
+    CFRelease(drag);
+    
+    return YES;
+}
+
+@end
diff --git a/Classes/NJOutputViewController.h b/Classes/NJOutputViewController.h
index 7e35b70..143e04e 100644
--- a/Classes/NJOutputViewController.h
+++ b/Classes/NJOutputViewController.h
@@ -27,6 +27,9 @@
 @property (nonatomic, strong) IBOutlet NSPopUpButton *mappingPopup;
 @property (nonatomic, strong) IBOutlet NSButton *smoothCheck;
 @property (nonatomic, strong) IBOutlet NSButton *unknownMapping;
+@property (nonatomic, strong) IBOutlet NSSegmentedControl *dragBtnSelect;
+@property (nonatomic, strong) IBOutlet NSSegmentedControl *dragDirSelect;
+@property (nonatomic, strong) IBOutlet NSSlider *dragSpeedSlider;
 
 @property (nonatomic, weak) IBOutlet id <NJOutputViewControllerDelegate> delegate;
 
@@ -40,6 +43,9 @@
 - (IBAction)mouseSpeedChanged:(id)sender;
 - (IBAction)scrollSpeedChanged:(id)sender;
 - (IBAction)scrollTypeChanged:(id)sender;
+- (IBAction)dragButtonChanged:(id)sender;
+- (IBAction)dragDirectionChanged:(id)sender;
+- (IBAction)dragSpeedChanged:(id)sender;
 
 @end
 
diff --git a/Classes/NJOutputViewController.m b/Classes/NJOutputViewController.m
index 1c5bb72..f7d6e9a 100644
--- a/Classes/NJOutputViewController.m
+++ b/Classes/NJOutputViewController.m
@@ -18,6 +18,7 @@
 #import "NJOutputMouseButton.h"
 #import "NJOutputMouseMove.h"
 #import "NJOutputMouseScroll.h"
+#import "NJOutputMouseDrag.h"
 
 @implementation NJOutputViewController {
     NJInput *_input;
@@ -80,6 +81,20 @@ - (void)cleanUpInterface {
         if (self.scrollDirSelect.selectedSegment == -1)
             self.scrollDirSelect.selectedSegment = 0;
     }
+    
+    if (row != 6) {
+        self.dragDirSelect.selectedSegment = -1;
+        self.dragSpeedSlider.doubleValue = self.dragSpeedSlider.minValue;
+        self.dragBtnSelect.selectedSegment = -1;
+        [self.dragDirSelect resignIfFirstResponder];
+    } else {
+        if (self.dragDirSelect.selectedSegment == -1)
+            self.dragDirSelect.selectedSegment = 0;
+        if (self.dragSpeedSlider.floatValue == 0)
+            self.dragSpeedSlider.floatValue = 10;
+        if (self.dragBtnSelect.selectedSegment == -1)
+            self.dragBtnSelect.selectedSegment = 0;
+    }
         
 }
 
@@ -153,6 +168,24 @@ - (IBAction)scrollTypeChanged:(NSButton *)sender {
     [self commit];
 }
 
+- (void)dragButtonChanged:(NSView *)sender {
+    [self.radioButtons selectCellAtRow:6 column:0];
+    [sender.window makeFirstResponder:sender];
+    [self commit];
+}
+
+- (void)dragDirectionChanged:(NSView *)sender {
+    [self.radioButtons selectCellAtRow:6 column:0];
+    [sender.window makeFirstResponder:sender];
+    [self commit];
+}
+
+- (void)dragSpeedChanged:(NSSlider *)sender {
+    [self.radioButtons selectCellAtRow:6 column:0];
+    [sender.window makeFirstResponder:sender];
+    [self commit];
+}
+
 - (NJOutput *)makeOutput {
     switch (self.radioButtons.selectedRow) {
         case 0:
@@ -190,6 +223,13 @@ - (NJOutput *)makeOutput {
             ms.smooth = self.smoothCheck.state == NSOnState;
             return ms;
         }
+        case 6: {
+            NJOutputMouseDrag *md = [[NJOutputMouseDrag alloc] init];
+            md.axis = (int)self.dragDirSelect.selectedSegment;
+            md.speed = self.dragSpeedSlider.floatValue;
+            md.button = (int)[self.dragBtnSelect.cell tagForSegment:self.dragBtnSelect.selectedSegment];
+            return md;
+        }
         default:
             return nil;
     }
@@ -216,6 +256,9 @@ - (void)setEnabled:(BOOL)enabled {
     self.scrollDirSelect.enabled = enabled;
     self.smoothCheck.enabled = enabled;
     self.scrollSpeedSlider.enabled = enabled && self.smoothCheck.state;
+    self.dragDirSelect.enabled = enabled;
+    self.dragSpeedSlider.enabled = enabled;
+    self.dragBtnSelect.enabled = enabled;
     if (!enabled)
         self.unknownMapping.hidden = YES;
 }
@@ -263,6 +306,12 @@ - (void)loadOutput:(NJOutput *)output forInput:(NJInput *)input {
         self.scrollSpeedSlider.floatValue = speed;
         self.smoothCheck.state = smooth ? NSOnState : NSOffState;
         self.scrollSpeedSlider.enabled = smooth;
+    }
+    else if ([output isKindOfClass:NJOutputMouseDrag.class]) {
+        [self.radioButtons selectCellAtRow:6 column:0];
+        self.dragDirSelect.selectedSegment = [(NJOutputMouseDrag *)output axis];
+        self.dragSpeedSlider.floatValue = [(NJOutputMouseDrag *)output speed];
+        [self.dragBtnSelect selectSegmentWithTag:[(NJOutputMouseDrag *)output button]];
     } else {
         [self.radioButtons selectCellAtRow:self.enabled ? 0 : -1 column:0];
     }
diff --git a/Enjoyable.xcodeproj/project.pbxproj b/Enjoyable.xcodeproj/project.pbxproj
index 3a213e8..3807ce3 100644
--- a/Enjoyable.xcodeproj/project.pbxproj
+++ b/Enjoyable.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
 		EEF17D6A16E8E2EF00D7DC4D /* NJOutputMouseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5716E8E2EF00D7DC4D /* NJOutputMouseButton.m */; };
 		EEF17D6B16E8E2EF00D7DC4D /* NJOutputMouseMove.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5916E8E2EF00D7DC4D /* NJOutputMouseMove.m */; };
 		EEF17D6C16E8E2EF00D7DC4D /* NJOutputMouseScroll.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5B16E8E2EF00D7DC4D /* NJOutputMouseScroll.m */; };
+		F279F40125305D3D00676675 /* NJOutputMouseDrag.m in Sources */ = {isa = PBXBuildFile; fileRef = F279F40025305D3D00676675 /* NJOutputMouseDrag.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -150,6 +151,8 @@
 		EEF17D5916E8E2EF00D7DC4D /* NJOutputMouseMove.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputMouseMove.m; path = Classes/NJOutputMouseMove.m; sourceTree = "<group>"; };
 		EEF17D5A16E8E2EF00D7DC4D /* NJOutputMouseScroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutputMouseScroll.h; path = Classes/NJOutputMouseScroll.h; sourceTree = "<group>"; };
 		EEF17D5B16E8E2EF00D7DC4D /* NJOutputMouseScroll.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputMouseScroll.m; path = Classes/NJOutputMouseScroll.m; sourceTree = "<group>"; };
+		F279F3FF25305CFA00676675 /* NJOutputMouseDrag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = NJOutputMouseDrag.h; path = Classes/NJOutputMouseDrag.h; sourceTree = "<group>"; };
+		F279F40025305D3D00676675 /* NJOutputMouseDrag.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputMouseDrag.m; path = Classes/NJOutputMouseDrag.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -323,6 +326,8 @@
 				EEF17D5916E8E2EF00D7DC4D /* NJOutputMouseMove.m */,
 				EEF17D5A16E8E2EF00D7DC4D /* NJOutputMouseScroll.h */,
 				EEF17D5B16E8E2EF00D7DC4D /* NJOutputMouseScroll.m */,
+				F279F3FF25305CFA00676675 /* NJOutputMouseDrag.h */,
+				F279F40025305D3D00676675 /* NJOutputMouseDrag.m */,
 			);
 			name = Output;
 			sourceTree = "<group>";
@@ -465,6 +470,7 @@
 				EEF17D3616E8E2E100D7DC4D /* NSMutableArray+MoveObject.m in Sources */,
 				EEF17D3716E8E2E100D7DC4D /* NSString+FixFilename.m in Sources */,
 				EEF17D3816E8E2E100D7DC4D /* NSView+FirstResponder.m in Sources */,
+				F279F40125305D3D00676675 /* NJOutputMouseDrag.m in Sources */,
 				EEF17D5C16E8E2EF00D7DC4D /* EnjoyableApplicationDelegate.m in Sources */,
 				EEF17D5D16E8E2EF00D7DC4D /* NJDevice.m in Sources */,
 				EEF17D5E16E8E2EF00D7DC4D /* NJInputController.m in Sources */,
diff --git a/Info.plist b/Info.plist
index a5366c0..1b14995 100644
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>663</string>
+	<string>673</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index a7ef96c..8853f3b 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="15G22010" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application">
+        <customObject id="-3" userLabel="Application" customClass="NSObject">
             <connections>
                 <outlet property="delegate" destination="482" id="483"/>
                 <outlet property="dockMenu" destination="81" id="732"/>
@@ -129,26 +129,26 @@
         </menu>
         <window title="Enjoyable" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Enjoyable" animationBehavior="default" id="450">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
-            <rect key="contentRect" x="355" y="59" width="664" height="323"/>
+            <rect key="contentRect" x="355" y="59" width="664" height="386"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
             <value key="minSize" type="size" width="664" height="323"/>
-            <view key="contentView" id="453">
-                <rect key="frame" x="0.0" y="0.0" width="664" height="323"/>
+            <view key="contentView" misplaced="YES" id="453">
+                <rect key="frame" x="0.0" y="0.0" width="664" height="386"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView id="916">
-                        <rect key="frame" x="0.0" y="0.0" width="234" height="323"/>
+                        <rect key="frame" x="0.0" y="0.0" width="234" height="386"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="634">
-                                <rect key="frame" x="0.0" y="0.0" width="234" height="323"/>
+                                <rect key="frame" x="0.0" y="0.0" width="234" height="386"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <clipView key="contentView" id="g9c-iw-R62">
-                                    <rect key="frame" x="1" y="1" width="232" height="321"/>
+                                    <rect key="frame" x="1" y="1" width="232" height="384"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="systemDefault" indentationPerLevel="16" outlineTableColumn="639" id="637" userLabel="Input Device List">
-                                            <rect key="frame" x="0.0" y="0.0" width="232" height="321"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="232" height="384"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -185,7 +185,7 @@
                                 </scroller>
                             </scrollView>
                             <button id="913">
-                                <rect key="frame" x="20" y="20" width="194" height="283"/>
+                                <rect key="frame" x="20" y="20" width="194" height="346"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="overlaps" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="914">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -196,7 +196,7 @@ Connect a device to begin mapping.</string>
                                 </buttonCell>
                             </button>
                             <button hidden="YES" id="974">
-                                <rect key="frame" x="20" y="20" width="194" height="283"/>
+                                <rect key="frame" x="20" y="20" width="194" height="346"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="overlaps" alignment="center" enabled="NO" imageScaling="proportionallyDown" inset="2" id="975">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -208,16 +208,16 @@ Switch back to re-enable input.</string>
                             </button>
                         </subviews>
                     </customView>
-                    <customView id="917">
-                        <rect key="frame" x="233" y="0.0" width="431" height="323"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
+                    <customView misplaced="YES" id="917">
+                        <rect key="frame" x="233" y="0.0" width="431" height="386"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" heightSizable="YES"/>
                         <subviews>
                             <box verticalHuggingPriority="750" boxType="separator" id="708">
-                                <rect key="frame" x="12" y="276" width="406" height="5"/>
+                                <rect key="frame" x="12" y="339" width="406" height="5"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             </box>
                             <textField verticalHuggingPriority="750" id="706" userLabel="Input Name">
-                                <rect key="frame" x="9" y="286" width="412" height="17"/>
+                                <rect key="frame" x="9" y="349" width="412" height="17"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingMiddle" sendsActionOnEndEditing="YES" alignment="center" placeholderString="No input selected" usesSingleLineMode="YES" id="707">
                                     <font key="font" metaFont="systemBold"/>
@@ -226,7 +226,7 @@ Switch back to re-enable input.</string>
                                 </textFieldCell>
                             </textField>
                             <matrix verticalHuggingPriority="750" selectionByRect="NO" id="656" userLabel="Output Types">
-                                <rect key="frame" x="24" y="20" width="163" height="250"/>
+                                <rect key="frame" x="24" y="41" width="163" height="292"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 <size key="cellSize" width="163" height="40"/>
@@ -261,6 +261,10 @@ Switch back to re-enable input.</string>
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
+                                        <buttonCell type="radio" title="Drag the mouse:" imagePosition="left" alignment="left" enabled="NO" inset="2" id="gFO-AI-cmv" userLabel="Mouse Drag">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
                                     </column>
                                 </cells>
                                 <connections>
@@ -268,23 +272,23 @@ Switch back to re-enable input.</string>
                                 </connections>
                             </matrix>
                             <popUpButton verticalHuggingPriority="750" id="700" userLabel="Mapping Choice List">
-                                <rect key="frame" x="188" y="153" width="226" height="26"/>
+                                <rect key="frame" x="188" y="216" width="226" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="701">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
+                                    <font key="font" metaFont="menu"/>
                                     <menu key="menu" title="OtherViews" id="702"/>
                                 </popUpButtonCell>
                             </popUpButton>
                             <customView id="778" customClass="NJKeyInputField">
-                                <rect key="frame" x="191" y="196" width="220" height="23"/>
+                                <rect key="frame" x="191" y="259" width="220" height="23"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <connections>
                                     <outlet property="delegate" destination="686" id="966"/>
                                 </connections>
                             </customView>
                             <slider toolTip="Maximum mouse speed" verticalHuggingPriority="750" id="883">
-                                <rect key="frame" x="191" y="108" width="220" height="16"/>
+                                <rect key="frame" x="191" y="171" width="220" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <sliderCell key="cell" controlSize="mini" alignment="left" minValue="1" maxValue="20" doubleValue="10" tickMarkPosition="above" numberOfTickMarks="20" allowsTickMarkValuesOnly="YES" sliderType="linear" id="884"/>
                                 <connections>
@@ -292,7 +296,7 @@ Switch back to re-enable input.</string>
                                 </connections>
                             </slider>
                             <segmentedControl verticalHuggingPriority="750" id="744" userLabel="Mouse Button Selector">
-                                <rect key="frame" x="189" y="70" width="224" height="24"/>
+                                <rect key="frame" x="189" y="133" width="224" height="24"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="745">
                                     <font key="font" metaFont="system"/>
@@ -308,8 +312,25 @@ Switch back to re-enable input.</string>
                                     <action selector="mouseButtonChanged:" target="686" id="1039"/>
                                 </connections>
                             </segmentedControl>
+                            <segmentedControl verticalHuggingPriority="750" misplaced="YES" id="ok5-Se-Iuv" userLabel="Mouse Drag Button Selector">
+                                <rect key="frame" x="189" y="56" width="224" height="24"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="ueL-1I-6Hy">
+                                    <font key="font" metaFont="system"/>
+                                    <segments>
+                                        <segment label="Left" width="55"/>
+                                        <segment label="Center" width="60" tag="2"/>
+                                        <segment label="Right" width="55" tag="1"/>
+                                        <segment label="4" width="22" tag="3"/>
+                                        <segment label="5" width="22" tag="4"/>
+                                    </segments>
+                                </segmentedCell>
+                                <connections>
+                                    <action selector="dragButtonChanged:" target="686" id="aAx-TZ-qhe"/>
+                                </connections>
+                            </segmentedControl>
                             <slider toolTip="Mouse scroll speed" verticalHuggingPriority="750" id="887">
-                                <rect key="frame" x="191" y="24" width="146" height="16"/>
+                                <rect key="frame" x="191" y="87" width="146" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <sliderCell key="cell" controlSize="mini" state="on" alignment="left" minValue="1" maxValue="29" doubleValue="15" tickMarkPosition="above" numberOfTickMarks="15" allowsTickMarkValuesOnly="YES" sliderType="linear" id="888"/>
                                 <connections>
@@ -317,7 +338,7 @@ Switch back to re-enable input.</string>
                                 </connections>
                             </slider>
                             <segmentedControl verticalHuggingPriority="750" id="749" userLabel="Mouse Scroll Selector">
-                                <rect key="frame" x="189" y="33" width="150" height="20"/>
+                                <rect key="frame" x="189" y="96" width="150" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="750">
                                     <font key="font" metaFont="smallSystem"/>
@@ -333,7 +354,7 @@ Switch back to re-enable input.</string>
                                 </connections>
                             </segmentedControl>
                             <button id="946">
-                                <rect key="frame" x="343" y="31" width="70" height="18"/>
+                                <rect key="frame" x="343" y="94" width="70" height="18"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="check" title="Smooth" bezelStyle="regularSquare" imagePosition="left" inset="2" id="947">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -344,7 +365,7 @@ Switch back to re-enable input.</string>
                                 </connections>
                             </button>
                             <segmentedControl verticalHuggingPriority="750" id="754" userLabel="Mouse Motion Selector">
-                                <rect key="frame" x="189" y="117" width="224" height="20"/>
+                                <rect key="frame" x="189" y="180" width="224" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                 <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="755">
                                     <font key="font" metaFont="smallSystem"/>
@@ -359,8 +380,32 @@ Switch back to re-enable input.</string>
                                     <action selector="mouseDirectionChanged:" target="686" id="1040"/>
                                 </connections>
                             </segmentedControl>
+                            <slider toolTip="Maximum mouse speed" verticalHuggingPriority="750" misplaced="YES" id="LOG-AH-gR2">
+                                <rect key="frame" x="191" y="29" width="220" height="16"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                <sliderCell key="cell" controlSize="mini" alignment="left" minValue="1" maxValue="20" doubleValue="10" tickMarkPosition="above" numberOfTickMarks="20" allowsTickMarkValuesOnly="YES" sliderType="linear" id="ikd-BG-wlI"/>
+                                <connections>
+                                    <action selector="dragSpeedChanged:" target="686" id="Su4-BQ-bda"/>
+                                </connections>
+                            </slider>
+                            <segmentedControl verticalHuggingPriority="750" misplaced="YES" id="Hrp-xZ-dUJ" userLabel="Mouse Drag Motion Selector">
+                                <rect key="frame" x="189" y="38" width="224" height="20"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="Ogk-f4-1aF">
+                                    <font key="font" metaFont="smallSystem"/>
+                                    <segments>
+                                        <segment label="←" width="55"/>
+                                        <segment label="→" width="55" tag="1"/>
+                                        <segment label="↑" width="53"/>
+                                        <segment label="↓" width="52"/>
+                                    </segments>
+                                </segmentedCell>
+                                <connections>
+                                    <action selector="dragDirectionChanged:" target="686" id="BRO-qS-sam"/>
+                                </connections>
+                            </segmentedControl>
                             <button id="1020">
-                                <rect key="frame" x="197" y="157" width="193" height="21"/>
+                                <rect key="frame" x="197" y="220" width="193" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                 <buttonCell key="cell" type="bevel" title="Unknown Mapping" bezelStyle="rounded" alignment="left" enabled="NO" refusesFirstResponder="YES" imageScaling="proportionallyDown" inset="2" id="1021">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -416,6 +461,7 @@ Switch back to re-enable input.</string>
             <connections>
                 <outlet property="delegate" destination="482" id="977"/>
             </connections>
+            <point key="canvasLocation" x="139" y="176"/>
         </window>
         <menu id="918" userLabel="Status Item Menu">
             <items>
@@ -472,6 +518,9 @@ Switch back to re-enable input.</string>
         <customObject id="686" customClass="NJOutputViewController">
             <connections>
                 <outlet property="delegate" destination="482" id="1035"/>
+                <outlet property="dragBtnSelect" destination="ok5-Se-Iuv" id="qfz-LN-Rxi"/>
+                <outlet property="dragDirSelect" destination="Hrp-xZ-dUJ" id="6E5-X1-8Ln"/>
+                <outlet property="dragSpeedSlider" destination="LOG-AH-gR2" id="c0O-ZH-TKa"/>
                 <outlet property="keyInput" destination="778" id="781"/>
                 <outlet property="mappingPopup" destination="700" id="823"/>
                 <outlet property="mouseBtnSelect" destination="744" id="746"/>
@@ -582,7 +631,7 @@ CA
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="eqm-JJ-mBn">
                         <rect key="frame" x="1" y="1" width="198" height="198"/>
-                        <autoresizingMask key="autoresizingMask"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="24" rowSizeStyle="systemDefault" id="459" userLabel="Mapping List">
                                 <rect key="frame" x="0.0" y="0.0" width="198" height="198"/>
diff --git a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
index f52c5b6..6d26c1e 100644
--- a/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
+++ b/Resources/Help/Contents/Resources/English.lproj/pgs/mouse.html
@@ -76,5 +76,21 @@ <h3><a name="scrolling"></a>Scrolling</h3>
       change this globally in <b> > System Preferences… > Mouse</b>
       and <b> > System Preferences… > Trackpad</b>.
     </p>
+    
+    <h3>Dragging</h3>
+    <p>
+        Select the mouse button you'd like the input to simulate while dragging.
+    </p>
+    <p>
+        Select the direction you'd like the input to move the
+        mouse. Adjust the movement speed using the slider underneath.
+        If you're mapping an analog input then this is the maximum
+        speed; for a button it's a constant speed.
+    </p>
+    <p>
+        The speed is independent for each input. You can have faster
+        horizontal movement than vertical movement, or map one set of
+        inputs to a fast speed and another set to a slow speed.
+    </p>
   </body>
 </html>