diff --git a/wa/commands/create.py b/wa/commands/create.py
index f3ea0cfa..5048fc8a 100644
--- a/wa/commands/create.py
+++ b/wa/commands/create.py
@@ -1,12 +1,22 @@
+import os
 import sys
+import stat
+import string
 from collections import OrderedDict
+from distutils.dir_util import copy_tree
 
-from wa import ComplexCommand, SubCommand, pluginloader
+from wa import ComplexCommand, SubCommand, pluginloader, settings
 from wa.framework.target.descriptor import get_target_descriptions
-from wa.framework.exception import ConfigError
-
+from wa.framework.exception import ConfigError, CommandError
+from wa.utils.misc import (ensure_directory_exists as _d, capitalize,
+                           ensure_file_directory_exists as _f)
 from wa.utils.serializer import yaml
 
+from devlib.utils.types import identifier
+
+
+TEMPLATES_DIR = os.path.join(os.path.dirname(__file__), 'templates')
+
 
 class CreateAgendaSubcommand(SubCommand):
 
@@ -68,6 +78,35 @@ class CreateAgendaSubcommand(SubCommand):
             wfh.close()
 
 
+class CreateWorkloadSubcommand(SubCommand):
+
+    name = 'workload'
+    description = '''Create a new workload. By default, a basic workload template will be
+                     used but you can specify the `KIND` to choose a different template.'''
+
+    def initialize(self, context):
+        self.parser.add_argument('name', metavar='NAME',
+                                 help='Name of the workload to be created')
+        self.parser.add_argument('-p', '--path', metavar='PATH', default=None,
+                                 help='The location at which the workload will be created. If not specified, ' +
+                                      'this defaults to "~/.workload_automation/plugins".')
+        self.parser.add_argument('-f', '--force', action='store_true',
+                                 help='Create the new workload even if a workload with the specified ' +
+                                      'name already exists.')
+        self.parser.add_argument('-k', '--kind', metavar='KIND', default='basic', choices=create_funcs.keys(),
+                                 help='The type of workload to be created. The available options ' +
+                                      'are: {}'.format(', '.join(create_funcs.keys())))
+
+    def execute(self, state, args):  # pylint: disable=R0201
+        where = args.path or 'local'
+        check_name = not args.force
+
+        try:
+            create_workload(args.name, args.kind, where, check_name)
+        except CommandError as e:
+            self.logger.error('ERROR: {}'.format(e))
+
+
 class CreateCommand(ComplexCommand):
 
     name = 'create'
@@ -77,7 +116,92 @@ class CreateCommand(ComplexCommand):
     object-specific arguments.
     '''
     subcmd_classes = [
-        #CreateWorkloadSubcommand,
-        #CreatePackageSubcommand,
+        CreateWorkloadSubcommand,
         CreateAgendaSubcommand,
+        #CreatePackageSubcommand,
     ]
+
+
+def create_workload(name, kind='basic', where='local', check_name=True, **kwargs):
+
+    if check_name:
+        if name in [wl.name for wl in pluginloader.list_plugins('workload')]:
+            raise CommandError('Workload with name "{}" already exists.'.format(name))
+
+    class_name = get_class_name(name)
+    if where == 'local':
+        workload_dir = _d(os.path.join(settings.plugins_directory, name))
+    else:
+        workload_dir = _d(os.path.join(where, name))
+
+    try:
+        # Note: `create_funcs` mapping is listed below
+        create_funcs[kind](workload_dir, name, kind, class_name, **kwargs)
+    except KeyError:
+        raise CommandError('Unknown workload type: {}'.format(kind))
+
+    print 'Workload created in {}'.format(workload_dir)
+
+
+def create_template_workload(path, name, kind, class_name):
+    source_file = os.path.join(path, '__init__.py')
+    with open(source_file, 'w') as wfh:
+        wfh.write(render_template('{}_workload'.format(kind), {'name': name, 'class_name': class_name}))
+
+def create_uiautomator_template_workload(path, name, kind, class_name):
+    uiauto_path = os.path.join(path, 'uiauto')
+    create_uiauto_project(uiauto_path, name)
+    create_template_workload(path, name, kind, class_name)
+
+def create_uiauto_project(path, name):
+    package_name = 'com.arm.wa.uiauto.' + name.lower()
+
+    copy_tree(os.path.join(TEMPLATES_DIR, 'uiauto', 'uiauto_workload_template'), path)
+
+    manifest_path = os.path.join(path, 'app', 'src', 'main')
+    mainifest = os.path.join(_d(manifest_path), 'AndroidManifest.xml')
+    with open(mainifest, 'w') as wfh:
+        wfh.write(render_template(os.path.join('uiauto', 'uiauto_AndroidManifest.xml'),
+                                  {'package_name': package_name}))
+
+    build_gradle_path = os.path.join(path, 'app')
+    build_gradle = os.path.join(_d(build_gradle_path), 'build.gradle')
+    with open(build_gradle, 'w') as wfh:
+        wfh.write(render_template(os.path.join('uiauto', 'uiauto_build.gradle'),
+                                  {'package_name': package_name}))
+
+    build_script = os.path.join(path, 'build.sh')
+    with open(build_script, 'w') as wfh:
+        wfh.write(render_template(os.path.join('uiauto', 'uiauto_build_script'),
+                                  {'package_name': package_name}))
+    os.chmod(build_script, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
+
+    source_file = _f(os.path.join(path, 'app', 'src', 'main', 'java',
+                                  os.sep.join(package_name.split('.')[:-1]),
+                                  'UiAutomation.java'))
+    with open(source_file, 'w') as wfh:
+        wfh.write(render_template(os.path.join('uiauto', 'UiAutomation.java'),
+                                  {'name': name, 'package_name': package_name}))
+
+# Mapping of workload types to their corresponding creation method
+create_funcs = {
+    'basic' : create_template_workload,
+    'apk' : create_template_workload,
+    'revent' : create_template_workload,
+    'apk_revent' : create_template_workload,
+    'uiauto' : create_uiautomator_template_workload,
+    'apk_uiauto' : create_uiautomator_template_workload,
+}
+
+# Utility functions
+def render_template(name, params):
+    filepath = os.path.join(TEMPLATES_DIR, name)
+    with open(filepath) as fh:
+        text = fh.read()
+        template = string.Template(text)
+        return template.substitute(params)
+
+
+def get_class_name(name, postfix=''):
+    name = identifier(name)
+    return ''.join(map(capitalize, name.split('_'))) + postfix
diff --git a/wa/commands/templates/apk_workload b/wa/commands/templates/apk_workload
new file mode 100644
index 00000000..96e377e7
--- /dev/null
+++ b/wa/commands/templates/apk_workload
@@ -0,0 +1,54 @@
+from wa import Parameter, ApkWorkload
+
+
+class ${class_name}(ApkWorkload):
+
+    name = '${name}'
+    description = "This is an placeholder description"
+    # Replace with a list of supported package name(s) in the APK file(s).
+    package_names = ['package_name']
+
+    parameters = [
+        # Workload parameters go here e.g.
+        Parameter('example_parameter', kind=int, allowed_values=[1,2,3],
+                  default=1, override=True, mandatory=False,
+                  description='This is an example parameter')
+    ]
+
+    def __init__(self, target, **kwargs):
+        super(${class_name}, self).__init__(target, **kwargs)
+        # Define any additional attiributes required for the workload
+
+    def init_resources(self, context):
+        super(${class_name}, self).init_resources(context)
+        # This method may be used to perform early resource discovery and
+        # initialization. This is invoked during the initial loading stage and
+        # before the device is ready, so cannot be used for any device-dependent
+        # initialization. This method is invoked before the workload instance is
+        # validated.
+
+    def initialize(self, context):
+        super(${class_name}, self).initialize(context)
+        # This method should be used to perform once-per-run initialization of a
+        # workload instance.
+
+    def validate(self):
+        super(${class_name}, self).validate(context)
+        # Validate inter-parameter assumptions etc
+
+    def setup(self, context):
+        super(${class_name}, self).setup(context)
+        # Perform any necessary setup before starting the application
+
+    def extract_results(self, context):
+        super(${class_name}, self).extract_results(context)
+        # Extract results on the target
+
+    def update_output(self, context):
+        super(${class_name}, self).update_output(context)
+        # Update the output within the specified execution context with the
+        # metrics and artifacts form this workload iteration.
+
+    def teardown(self, context):
+        super(${class_name}, self).teardown(context)
+        # Perform any final clean up for the Workload.
diff --git a/wa/commands/templates/basic_workload b/wa/commands/templates/basic_workload
new file mode 100644
index 00000000..bfd7795f
--- /dev/null
+++ b/wa/commands/templates/basic_workload
@@ -0,0 +1,56 @@
+from wa import Parameter, Workload
+
+
+class ${class_name}(Workload):
+
+    name = '${name}'
+    description = "This is an placeholder description"
+
+    parameters = [
+        # Workload parameters go here e.g.
+        Parameter('example_parameter', kind=int, allowed_values=[1,2,3],
+                  default=1, override=True, mandatory=False,
+                  description='This is an example parameter')
+    ]
+
+    def __init__(self, target, **kwargs):
+        super(${class_name}, self).__init__(target, **kwargs)
+        # Define any additional attiributes required for the workload
+
+    def init_resources(self, context):
+        super(${class_name}, self).init_resources(context)
+        # This method may be used to perform early resource discovery and
+        # initialization. This is invoked during the initial loading stage and
+        # before the device is ready, so cannot be used for any device-dependent
+        # initialization. This method is invoked before the workload instance is
+        # validated.
+
+    def initialize(self, context):
+        super(${class_name}, self).initialize(context)
+        # This method should be used to perform once-per-run initialization of a
+        # workload instance.
+
+    def validate(self):
+        super(${class_name}, self).validate(context)
+        # Validate inter-parameter assumptions etc
+
+    def setup(self, context):
+        super(${class_name}, self).setup(context)
+        # Perform any necessary setup before starting the workload
+
+    def run(self, context):
+        super(${class_name}, self).run(context)
+        # Perform the main functionality of the workload
+
+    def extract_results(self, context):
+        super(${class_name}, self).extract_results(context)
+        # Extract results on the target
+
+    def update_output(self, context):
+        super(${class_name}, self).update_output(context)
+        # Update the output within the specified execution context with the
+        # metrics and artifacts form this workload iteration.
+
+    def teardown(self, context):
+        super(${class_name}, self).teardown(context)
+        # Perform any final clean up for the Workload.
diff --git a/wa/commands/templates/uiauto/UiAutomation.java b/wa/commands/templates/uiauto/UiAutomation.java
new file mode 100644
index 00000000..5b027ab8
--- /dev/null
+++ b/wa/commands/templates/uiauto/UiAutomation.java
@@ -0,0 +1,57 @@
+package ${package_name};
+
+import android.app.Activity;
+import android.os.Bundle;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import android.support.test.runner.AndroidJUnit4;
+
+import android.util.Log;
+import android.view.KeyEvent;
+
+// Import the uiautomator libraries
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.arm.wa.uiauto.BaseUiAutomation;
+
+@RunWith(AndroidJUnit4.class)
+public class UiAutomation extends BaseUiAutomation {
+
+    protected Bundle parameters;
+
+    public static String TAG = "${name}";
+
+    @Before
+    public void initilize() throws Exception {
+        parameters = getParams();
+        // Perform any parameter initialization here
+    }
+
+    @Test
+    public void setup() throws Exception {
+        // Optional: Perform any setup required before the main workload
+        // is ran, e.g. dismissing welcome screens
+    }
+
+    @Test
+    public void runWorkload() throws Exception {
+	   // The main UI Automation code goes here
+    }
+
+    @Test
+    public void extractResults() throws Exception {
+        // Optional: Extract any relevant results from the workload,
+    }
+
+    @Test
+    public void teardown() throws Exception {
+        // Optional: Perform any clean up for the workload
+    }
+}
diff --git a/wa/commands/templates/uiauto/uiauto_AndroidManifest.xml b/wa/commands/templates/uiauto/uiauto_AndroidManifest.xml
new file mode 100644
index 00000000..071635cb
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="${package_name}"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="${package_name}"/>
+
+</manifest>
diff --git a/wa/commands/templates/uiauto/uiauto_build.gradle b/wa/commands/templates/uiauto/uiauto_build.gradle
new file mode 100644
index 00000000..4d1bc4d3
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 18
+    buildToolsVersion '25.0.0'
+    defaultConfig {
+        applicationId "${package_name}"
+        minSdkVersion 18
+        targetSdkVersion 25
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        applicationVariants.all { variant ->
+            variant.outputs.each { output ->
+                output.outputFile = file("$$project.buildDir/apk/${package_name}.apk")
+            }
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support.test:runner:0.5'
+    compile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+    compile(name: 'uiauto', ext: 'aar')
+}
+
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
diff --git a/wa/commands/templates/uiauto/uiauto_build_script b/wa/commands/templates/uiauto/uiauto_build_script
new file mode 100644
index 00000000..ba15b628
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_build_script
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# CD into build dir if possible - allows building from any directory
+script_path='.'
+if `readlink -f $$0 &>/dev/null`; then
+    script_path=`readlink -f $$0 2>/dev/null`
+fi
+script_dir=`dirname $$script_path`
+cd $$script_dir
+
+# Ensure gradelw exists before starting
+if [[ ! -f gradlew ]]; then
+    echo 'gradlew file not found! Check that you are in the right directory.'
+    exit 9
+fi
+
+# Copy base class library from wlauto dist
+libs_dir=app/libs
+base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"`
+mkdir -p $$libs_dir
+cp $$base_class $$libs_dir
+
+# Build and return appropriate exit code if failed
+# gradle build
+./gradlew clean :app:assembleDebug
+exit_code=$$?
+if [[ $$exit_code -ne 0 ]]; then
+    echo "ERROR: 'gradle build' exited with code $$exit_code"
+    exit $$exit_code
+fi
+
+# If successful move APK file to workload folder (overwrite previous)
+rm -f ../$package_name
+if [[ -f app/build/apk/$package_name.apk ]]; then
+    cp app/build/apk/$package_name.apk ../$package_name.apk
+else
+    echo 'ERROR: UiAutomator apk could not be found!'
+    exit 9
+fi
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle b/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle
new file mode 100644
index 00000000..b78a0b86
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.jar b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..760fcce7
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 03 15:42:44 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/gradlew b/wa/commands/templates/uiauto/uiauto_workload_template/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/gradlew.bat b/wa/commands/templates/uiauto/uiauto_workload_template/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/wa/commands/templates/uiauto/uiauto_workload_template/settings.gradle b/wa/commands/templates/uiauto/uiauto_workload_template/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/wa/commands/templates/uiauto/uiauto_workload_template/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/wa/commands/templates/uiauto_workload b/wa/commands/templates/uiauto_workload
new file mode 100644
index 00000000..7a3e5a82
--- /dev/null
+++ b/wa/commands/templates/uiauto_workload
@@ -0,0 +1,58 @@
+from wa import Parameter, UiautoWorkload
+
+
+class ${class_name}(UiautoWorkload):
+
+    name = '${name}'
+    description = "This is an placeholder description"
+    # Replace with a list of supported package names from the APK file(s)
+    package_names = ['package_name']
+
+    parameters = [
+        # Workload parameters go here e.g.
+        Parameter('example_parameter', kind=int, allowed_values=[1,2,3],
+                  default=1, override=True, mandatory=False,
+                  description='This is an example parameter')
+    ]
+
+    def __init__(self, target, **kwargs):
+        super(${class_name}, self).__init__(target, **kwargs)
+        # Define any additional attiributes required for the workload
+
+    def init_resources(self, context):
+        super(${class_name}, self).init_resources(context)
+        # This method may be used to perform early resource discovery and
+        # initialization. This is invoked during the initial loading stage and
+        # before the device is ready, so cannot be used for any device-dependent
+        # initialization. This method is invoked before the workload instance is
+        # validated.
+
+    def initialize(self, context):
+        super(${class_name}, self).initialize(context)
+        # This method should be used to perform once-per-run initialization of a
+        # workload instance.
+
+    def validate(self):
+        super(${class_name}, self).validate(context)
+        # Validate inter-parameter assumptions etc
+
+    def setup(self, context):
+        super(${class_name}, self).setup(context)
+        # Perform any necessary setup before starting the UI automation
+
+    def run(self, context):
+        super(${class_name}, self).run(context)
+        # Perform the main functionality of the workload
+
+    def extract_results(self, context):
+        super(${class_name}, self).extract_results(context)
+        # Extract results on the target
+
+    def update_output(self, context):
+        super(${class_name}, self).update_output(context)
+        # Update the output within the specified execution context with the
+        # metrics and artifacts form this workload iteration.
+
+    def teardown(self, context):
+        super(${class_name}, self).teardown(context)
+        # Perform any final clean up for the Workload.