diff --git a/v2/ansible/executor/connection_info.py b/v2/ansible/executor/connection_info.py
index 8f53c3fe34..d70422399f 100644
--- a/v2/ansible/executor/connection_info.py
+++ b/v2/ansible/executor/connection_info.py
@@ -51,7 +51,7 @@ class ConnectionInformation:
         self.sudo_user   = ''
         self.sudo_pass   = ''
         self.verbosity   = 0
-        self.only_tags   = set(['all'])
+        self.only_tags   = set()
         self.skip_tags   = set()
 
         if play:
@@ -101,6 +101,9 @@ class ConnectionInformation:
             elif isinstance(options.tags, basestring):
                 self.only_tags.update(options.tags.split(','))
 
+        if len(self.only_tags) == 0:
+            self.only_tags = set(['all'])
+
         if hasattr(options, 'skip_tags'):
             if isinstance(options.skip_tags, list):
                 self.skip_tags.update(options.skip_tags)
diff --git a/v2/ansible/executor/playbook_executor.py b/v2/ansible/executor/playbook_executor.py
index 9c5a0b714a..5a5f86e7eb 100644
--- a/v2/ansible/executor/playbook_executor.py
+++ b/v2/ansible/executor/playbook_executor.py
@@ -53,6 +53,7 @@ class PlaybookExecutor:
 
         signal.signal(signal.SIGINT, self._cleanup)
 
+        result = 0
         try:
             for playbook_path in self._playbooks:
                 pb = Playbook.load(playbook_path, variable_manager=self._variable_manager, loader=self._loader)
@@ -67,7 +68,6 @@ class PlaybookExecutor:
                     new_play = play.copy()
                     new_play.post_validate(all_vars, fail_on_undefined=False)
 
-                    result = True
                     for batch in self._get_serialized_batches(new_play):
                         if len(batch) == 0:
                             raise AnsibleError("No hosts matched the list specified in the play", obj=play._ds)
@@ -75,22 +75,22 @@ class PlaybookExecutor:
                         self._inventory.restrict_to_hosts(batch)
                         # and run it...
                         result = self._tqm.run(play=play)
-                        if not result:
+                        if result != 0:
                             break
 
-                    if not result:
+                    if result != 0:
                         # FIXME: do something here, to signify the playbook execution failed
                         self._cleanup()
-                        return 1
+                        return result
         except:
             self._cleanup()
             raise
 
         self._cleanup()
-        return 0
+        return result
 
     def _cleanup(self, signum=None, framenum=None):
-        self._tqm.cleanup()
+        return self._tqm.cleanup()
 
     def _get_serialized_batches(self, play):
         '''
diff --git a/v2/ansible/executor/process/result.py b/v2/ansible/executor/process/result.py
index cb858017f9..3284fe0534 100644
--- a/v2/ansible/executor/process/result.py
+++ b/v2/ansible/executor/process/result.py
@@ -141,9 +141,9 @@ class ResultProcess(multiprocessing.Process):
                         else:
                             self._send_result(('set_host_facts', result._host, result._result['ansible_facts']))
 
-                    # if this task is registering a result, do it now
-                    if result._task.register:
-                        self._send_result(('set_host_var', result._host, result._task.register, result._result))
+                # if this task is registering a result, do it now
+                if result._task.register:
+                    self._send_result(('set_host_var', result._host, result._task.register, result._result))
 
             except Queue.Empty:
                 pass
diff --git a/v2/ansible/executor/task_executor.py b/v2/ansible/executor/task_executor.py
index e49bc9268f..71dc399a47 100644
--- a/v2/ansible/executor/task_executor.py
+++ b/v2/ansible/executor/task_executor.py
@@ -109,15 +109,14 @@ class TaskExecutor:
 
             try:
                 tmp_task = self._task.copy()
-                tmp_task.post_validate(task_vars)
             except AnsibleParserError, e:
                 results.append(dict(failed=True, msg=str(e)))
                 continue
 
-            # now we swap the internal task with the re-validate copy, execute,
+            # now we swap the internal task with the copy, execute,
             # and swap them back so we can do the next iteration cleanly
             (self._task, tmp_task) = (tmp_task, self._task)
-            res = self._execute()
+            res = self._execute(variables=task_vars)
             (self._task, tmp_task) = (tmp_task, self._task)
 
             # FIXME: we should be sending back a callback result for each item in the loop here
@@ -129,32 +128,24 @@ class TaskExecutor:
 
         return results
 
-    def _execute(self):
+    def _execute(self, variables=None):
         '''
         The primary workhorse of the executor system, this runs the task
         on the specified host (which may be the delegated_to host) and handles
         the retry/until and block rescue/always execution
         '''
 
+        if variables is None:
+            variables = self._job_vars
+
         self._connection = self._get_connection()
         self._handler    = self._get_action_handler(connection=self._connection)
 
-        # check to see if this task should be skipped, due to it being a member of a
-        # role which has already run (and whether that role allows duplicate execution)
-        if self._task._role and self._task._role.has_run():
-            # If there is no metadata, the default behavior is to not allow duplicates,
-            # if there is metadata, check to see if the allow_duplicates flag was set to true
-            if self._task._role._metadata is None or self._task._role._metadata and not self._task._role._metadata.allow_duplicates:
-                debug("task belongs to a role which has already run, but does not allow duplicate execution")
-                return dict(skipped=True, skip_reason='This role has already been run, but does not allow duplicates')
-
-        if not self._task.evaluate_conditional(self._job_vars):
+        if not self._task.evaluate_conditional(variables):
             debug("when evaulation failed, skipping this task")
             return dict(skipped=True, skip_reason='Conditional check failed')
 
-        if not self._task.evaluate_tags(self._connection_info.only_tags, self._connection_info.skip_tags):
-            debug("Tags don't match, skipping this task")
-            return dict(skipped=True, skip_reason='Skipped due to specified tags')
+        self._task.post_validate(variables)
 
         retries = self._task.retries
         if retries <= 0:
@@ -173,7 +164,7 @@ class TaskExecutor:
                 result['attempts'] = attempt + 1
 
             debug("running the handler")
-            result = self._handler.run(task_vars=self._job_vars)
+            result = self._handler.run(task_vars=variables)
             debug("handler run complete")
 
             if self._task.async > 0:
@@ -189,7 +180,7 @@ class TaskExecutor:
 
             if self._task.until:
                 # make a copy of the job vars here, in case we need to update them
-                vars_copy = self._job_vars.copy()
+                vars_copy = variables.copy()
                 # now update them with the registered value, if it is set
                 if self._task.register:
                     vars_copy[self._task.register] = result
diff --git a/v2/ansible/parsing/__init__.py b/v2/ansible/parsing/__init__.py
index 233b2ecc00..861ab57acd 100644
--- a/v2/ansible/parsing/__init__.py
+++ b/v2/ansible/parsing/__init__.py
@@ -179,7 +179,7 @@ class DataLoader():
 
         basedir = os.path.dirname(role_path)
         if os.path.islink(basedir):
-            # FIXME: 
+            # FIXME: implement unfrackpath
             #basedir = unfrackpath(basedir)
             template2 = os.path.join(basedir, dirname, source)
         else:
diff --git a/v2/ansible/playbook/base.py b/v2/ansible/playbook/base.py
index 4f0b726397..43d89e0299 100644
--- a/v2/ansible/playbook/base.py
+++ b/v2/ansible/playbook/base.py
@@ -122,7 +122,10 @@ class Base:
         return self
 
     def get_ds(self):
-        return self._ds
+       	try:
+            return getattr(self, '_ds')
+        except AttributeError:
+            return None
 
     def get_loader(self):
         return self._loader
@@ -214,11 +217,10 @@ class Base:
                 setattr(self, name, value)
 
             except (TypeError, ValueError), e:
-                #raise AnsibleParserError("the field '%s' has an invalid value, and could not be converted to an %s" % (name, attribute.isa), obj=self.get_ds())
-                raise AnsibleParserError("the field '%s' has an invalid value (%s), and could not be converted to an %s. Error was: %s" % (name, value, attribute.isa, e))
-            except UndefinedError:
+                raise AnsibleParserError("the field '%s' has an invalid value (%s), and could not be converted to an %s. Error was: %s" % (name, value, attribute.isa, e), obj=self.get_ds())
+            except UndefinedError, e:
                 if fail_on_undefined:
-                    raise AnsibleParserError("the field '%s' has an invalid value, which appears to include a variable that is undefined" % (name,))
+                    raise AnsibleParserError("the field '%s' has an invalid value, which appears to include a variable that is undefined. The error was: %s" % (name,e), obj=self.get_ds())
 
     def serialize(self):
         '''
diff --git a/v2/ansible/playbook/block.py b/v2/ansible/playbook/block.py
index e6dd9522de..d30bde5380 100644
--- a/v2/ansible/playbook/block.py
+++ b/v2/ansible/playbook/block.py
@@ -153,14 +153,13 @@ class Block(Base, Conditional, Taggable):
                 return False
         return super(Block, self).evaluate_conditional(all_vars)
 
-    def evaluate_tags(self, only_tags, skip_tags):
+    def evaluate_tags(self, only_tags, skip_tags, all_vars):
+        result = False
         if self._parent_block is not None:
-            if not self._parent_block.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags):
-                return False
+            result |= self._parent_block.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
         elif self._role is not None:
-            if not self._role.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags):
-                return False
-        return super(Block, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags)
+            result |= self._role.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
+        return result | super(Block, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
 
     def set_loader(self, loader):
         self._loader = loader
diff --git a/v2/ansible/playbook/role/__init__.py b/v2/ansible/playbook/role/__init__.py
index 2a7b409c85..afe4a1c48a 100644
--- a/v2/ansible/playbook/role/__init__.py
+++ b/v2/ansible/playbook/role/__init__.py
@@ -35,6 +35,7 @@ from ansible.playbook.helpers import load_list_of_blocks, compile_block_list
 from ansible.playbook.role.include import RoleInclude
 from ansible.playbook.role.metadata import RoleMetadata
 from ansible.playbook.taggable import Taggable
+from ansible.plugins import module_loader
 from ansible.utils.vars import combine_vars
 
 
@@ -127,6 +128,10 @@ class Role(Base, Conditional, Taggable):
         #self._loader.set_basedir(self._role_path)
 
         # load the role's files, if they exist
+        library = os.path.join(self._role_path, 'library')
+        if os.path.isdir(library):
+            module_loader.add_directory(library)
+
         metadata = self._load_role_yaml('meta')
         if metadata:
             self._metadata = RoleMetadata.load(metadata, owner=self, loader=self._loader)
diff --git a/v2/ansible/playbook/taggable.py b/v2/ansible/playbook/taggable.py
index a1d9f64184..e83f1d7ae5 100644
--- a/v2/ansible/playbook/taggable.py
+++ b/v2/ansible/playbook/taggable.py
@@ -19,7 +19,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from ansible.errors import AnsibleError
 from ansible.playbook.attribute import FieldAttribute
+from ansible.template import Templar
 
 class Taggable:
     _tags = FieldAttribute(isa='list', default=[])
@@ -27,20 +29,29 @@ class Taggable:
     def __init__(self):
         super(Taggable, self).__init__()
 
-    def get_tags(self):
-        return self._tags[:]
-
-    def evaluate_tags(self, only_tags, skip_tags):
-        if self.tags:
-            my_tags = set(self.tags)
+    def _load_tags(self, attr, ds):
+        if isinstance(ds, list):
+            return ds
+        elif isinstance(ds, basestring):
+            return [ ds ]
         else:
-            my_tags = set()
+            raise AnsibleError('tags must be specified as a list', obj=ds)
 
+    def evaluate_tags(self, only_tags, skip_tags, all_vars):
+        templar = Templar(loader=self._loader, variables=all_vars)
+        tags = templar.template(self.tags)
+        if not isinstance(tags, list):
+            tags = set([tags])
+        else:
+            tags = set(tags)
+
+        #print("%s tags are: %s, only_tags=%s, skip_tags=%s" % (self, my_tags, only_tags, skip_tags))
         if skip_tags:
-            skipped_tags = my_tags.intersection(skip_tags)
+            skipped_tags = tags.intersection(skip_tags)
             if len(skipped_tags) > 0:
                 return False
-        matched_tags = my_tags.intersection(only_tags)
+        matched_tags = tags.intersection(only_tags)
+        #print("matched tags are: %s" % matched_tags)
         if len(matched_tags) > 0 or 'all' in only_tags:
             return True
         else:
diff --git a/v2/ansible/playbook/task.py b/v2/ansible/playbook/task.py
index c0f34b5bdd..f9c5228158 100644
--- a/v2/ansible/playbook/task.py
+++ b/v2/ansible/playbook/task.py
@@ -203,7 +203,12 @@ class Task(Base, Conditional, Taggable):
         return listify_lookup_plugin_terms(value, all_vars, loader=self._loader)
 
     def get_vars(self):
-        return self.serialize()
+        all_vars = self.serialize()
+        if 'tags' in all_vars:
+            del all_vars['tags']
+        if 'when' in all_vars:
+            del all_vars['when']
+        return all_vars
 
     def compile(self):
         '''
@@ -273,16 +278,14 @@ class Task(Base, Conditional, Taggable):
                 return False
         return super(Task, self).evaluate_conditional(all_vars)
 
-    def evaluate_tags(self, only_tags, skip_tags):
+    def evaluate_tags(self, only_tags, skip_tags, all_vars):
+        result = False
         if len(self._dep_chain):
             for dep in self._dep_chain:
-                if not dep.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags):
-                    return False
+                result |= dep.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
         if self._block is not None:
-            if not self._block.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags):
-                return False
-        return super(Task, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags)
-
+            result |= self._block.evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
+        return result | super(Task, self).evaluate_tags(only_tags=only_tags, skip_tags=skip_tags, all_vars=all_vars)
 
     def set_loader(self, loader):
         '''
diff --git a/v2/ansible/plugins/action/__init__.py b/v2/ansible/plugins/action/__init__.py
index c9c50220dd..aa3ab5657f 100644
--- a/v2/ansible/plugins/action/__init__.py
+++ b/v2/ansible/plugins/action/__init__.py
@@ -397,7 +397,7 @@ class ActionBase:
         debug("done with _execute_module (%s, %s)" % (module_name, module_args))
         return data
 
-    def _low_level_execute_command(self, cmd, tmp, executable=None, sudoable=False, in_data=None):
+    def _low_level_execute_command(self, cmd, tmp, executable=None, sudoable=True, in_data=None):
         '''
         This is the function which executes the low level shell command, which
         may be commands to create/remove directories for temporary files, or to
@@ -413,8 +413,19 @@ class ActionBase:
         if executable is None:
             executable = C.DEFAULT_EXECUTABLE
 
+        prompt      = None
+        success_key = None
+
+        if sudoable:
+            if self._connection_info.su and self._connection_info.su_user:
+                cmd, prompt, success_key = self._connection_info.make_su_cmd(executable, cmd)
+            elif self._connection_info.sudo and self._connection_info.sudo_user:
+                # FIXME: hard-coded sudo_exe here
+                cmd, prompt, success_key = self._connection_info.make_sudo_cmd('/usr/bin/sudo', executable, cmd)
+
         debug("executing the command through the connection")
-        rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, executable=executable, in_data=in_data, sudoable=sudoable)
+        #rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, executable=executable, in_data=in_data, sudoable=sudoable)
+        rc, stdin, stdout, stderr = self._connection.exec_command(cmd, tmp, executable=executable, in_data=in_data)
         debug("command execution done")
 
         if not isinstance(stdout, basestring):
diff --git a/v2/ansible/plugins/action/assemble.py b/v2/ansible/plugins/action/assemble.py
index dcd6b7b398..1ae8be0203 100644
--- a/v2/ansible/plugins/action/assemble.py
+++ b/v2/ansible/plugins/action/assemble.py
@@ -24,8 +24,8 @@ import tempfile
 import base64
 import re
 
-
 from ansible.plugins.action import ActionBase
+from ansible.utils.boolean import boolean
 from ansible.utils.hashing import checksum_s
 
 class ActionModule(ActionBase):
@@ -78,21 +78,16 @@ class ActionModule(ActionBase):
         src        = self._task.args.get('src', None)
         dest       = self._task.args.get('dest', None)
         delimiter  = self._task.args.get('delimiter', None)
-        # FIXME: boolean needs to be moved out of utils
-        #remote_src = utils.boolean(options.get('remote_src', 'yes'))
         remote_src = self._task.args.get('remote_src', 'yes')
         regexp     = self._task.args.get('regexp', None)
 
         if src is None or dest is None:
             return dict(failed=True, msg="src and dest are required")
 
-        # FIXME: this should be boolean, hard-coded to yes for testing
-        if remote_src == 'yes':
+        if boolean(remote_src):
             return self._execute_module(tmp=tmp)
-        # FIXME: we don't do inject anymore, so not sure where the original
-        #        file stuff is going to end up at this time
-        #elif '_original_file' in inject:
-        #    src = utils.path_dwim_relative(inject['_original_file'], 'files', src, self.runner.basedir)
+        elif self._task._role is not None:
+            src = self._loader.path_dwim_relative(self._task._role._role_path, 'files', src)
         else:
             # the source is local, so expand it here
             src = os.path.expanduser(src)
diff --git a/v2/ansible/plugins/action/copy.py b/v2/ansible/plugins/action/copy.py
index b7aefeb967..6975bff1bf 100644
--- a/v2/ansible/plugins/action/copy.py
+++ b/v2/ansible/plugins/action/copy.py
@@ -111,16 +111,10 @@ class ActionModule(ActionBase):
         #        return ReturnData(conn=conn, result=results)
         ###############################################################################################
         else:
-            # FIXME: templating needs to be worked out still
-            #source = template.template(self.runner.basedir, source, inject)
-            # FIXME: original_file stuff needs to be reworked - most likely
-            #        simply checking to see if the task has a role and using
-            #        using the role path as the dwim target and basedir would work
-            #if '_original_file' in inject:
-            #    source = utils.path_dwim_relative(inject['_original_file'], 'files', source, self.runner.basedir)
-            #else:
-            #    source = utils.path_dwim(self.runner.basedir, source)
-            source = self._loader.path_dwim(source)
+            if self._task._role is not None:
+                source = self._loader.path_dwim_relative(self._task._role._role_path, 'files', source)
+            else:
+                source = self._loader.path_dwim(source)
 
         # A list of source file tuples (full_path, relative_path) which will try to copy to the destination
         source_files = []
@@ -129,7 +123,7 @@ class ActionModule(ActionBase):
         if os.path.isdir(source):
             # Get the amount of spaces to remove to get the relative path.
             if source_trailing_slash:
-                sz = len(source) + 1
+                sz = len(source)
             else:
                 sz = len(source.rsplit('/', 1)[0]) + 1
 
diff --git a/v2/ansible/plugins/action/include_vars.py b/v2/ansible/plugins/action/include_vars.py
index 6f721ab34e..345e0edc0e 100644
--- a/v2/ansible/plugins/action/include_vars.py
+++ b/v2/ansible/plugins/action/include_vars.py
@@ -32,7 +32,7 @@ class ActionModule(ActionBase):
         source = self._task.args.get('_raw_params')
 
         if self._task._role:
-            source = self._loader.path_dwim_relative(self._task._role.get('_role_path',''), 'vars', source)
+            source = self._loader.path_dwim_relative(self._task._role._role_path, 'vars', source)
         else:
             source = self._loader.path_dwim(source)
 
diff --git a/v2/ansible/plugins/action/template.py b/v2/ansible/plugins/action/template.py
index 2c8d960ced..56cd5bbcd0 100644
--- a/v2/ansible/plugins/action/template.py
+++ b/v2/ansible/plugins/action/template.py
@@ -45,7 +45,7 @@ class ActionModule(ActionBase):
         # look up the files and use the first one we find as src
         #if 'first_available_file' in task_vars:
         #    found = False
-        #    for fn in self.runner.module_vars.get('first_available_file'):
+        #    for fn in task_vars.get('first_available_file'):
         #        fn_orig = fn
         #        fnt = template.template(self.runner.basedir, fn, task_vars)
         #        fnd = utils.path_dwim(self.runner.basedir, fnt)
@@ -59,14 +59,13 @@ class ActionModule(ActionBase):
         #        result = dict(failed=True, msg="could not find src in first_available_file list")
         #        return ReturnData(conn=conn, comm_ok=False, result=result)
         #else:
-        #    source = template.template(self.runner.basedir, source, task_vars)
-        #        
-        #    if '_original_file' in task_vars:
-        #        source = utils.path_dwim_relative(task_vars['_original_file'], 'templates', source, self.runner.basedir)
-        #    else:
-        #        source = utils.path_dwim(self.runner.basedir, source)
+        if 1:
+            if self._task._role is not None:
+                source = self._loader.path_dwim_relative(self._task._role._role_path, 'templates', source)
+            else:
+                source = self._loader.path_dwim(source)
         ##################################################################################################
-        source = self._loader.path_dwim(source)
+        # END FIXME
         ##################################################################################################
 
         # Expand any user home dir specification
diff --git a/v2/ansible/plugins/connections/local.py b/v2/ansible/plugins/connections/local.py
index d2e1816ac0..f327c3f9de 100644
--- a/v2/ansible/plugins/connections/local.py
+++ b/v2/ansible/plugins/connections/local.py
@@ -39,12 +39,12 @@ class Connection(ConnectionBase):
         ''' connect to the local host; nothing to do here '''
         return self
 
-    def exec_command(self, cmd, tmp_path, sudo_user=None, sudoable=False, executable='/bin/sh', in_data=None, su=None, su_user=None):
+    def exec_command(self, cmd, tmp_path, executable='/bin/sh', in_data=None):
         ''' run a command on the local host '''
 
         debug("in local.exec_command()")
         # su requires to be run from a terminal, and therefore isn't supported here (yet?)
-        if su or su_user:
+        if self._connection_info.su:
             raise AnsibleError("Internal Error: this module does not support running commands via su")
 
         if in_data:
diff --git a/v2/ansible/plugins/connections/ssh.py b/v2/ansible/plugins/connections/ssh.py
index 979415ca3e..ee7db0295b 100644
--- a/v2/ansible/plugins/connections/ssh.py
+++ b/v2/ansible/plugins/connections/ssh.py
@@ -87,6 +87,7 @@ class Connection(ConnectionBase):
 
         if self._connection_info.port is not None:
             self._common_args += ["-o", "Port=%d" % (self._connection_info.port)]
+        # FIXME: need to get this from connection info
         #if self.private_key_file is not None:
         #    self._common_args += ["-o", "IdentityFile=\"%s\"" % os.path.expanduser(self.private_key_file)]
         #elif self.runner.private_key_file is not None:
@@ -256,7 +257,7 @@ class Connection(ConnectionBase):
             self._display.vvv("EXEC previous known host file not found for %s" % host)
         return True
 
-    def exec_command(self, cmd, tmp_path, executable='/bin/sh', in_data=None, sudoable=False):
+    def exec_command(self, cmd, tmp_path, executable='/bin/sh', in_data=None):
         ''' run a command on the remote host '''
 
         ssh_cmd = self._password_cmd()
@@ -266,15 +267,14 @@ class Connection(ConnectionBase):
             # inside a tty automatically invokes the python interactive-mode but the modules are not
             # compatible with the interactive-mode ("unexpected indent" mainly because of empty lines)
             ssh_cmd += ["-tt"]
-        # FIXME: verbosity needs to move, most likely into connection info or
-        #        whatever other context we pass around instead of runner objects
-        #if utils.VERBOSITY > 3:
-        #    ssh_cmd += ["-vvv"]
-        #else:
-        #    ssh_cmd += ["-q"]
-        ssh_cmd += ["-q"]
+        if self._connection_info.verbosity > 3:
+            ssh_cmd += ["-vvv"]
+        else:
+            ssh_cmd += ["-q"]
         ssh_cmd += self._common_args
 
+        # FIXME: ipv6 stuff needs to be figured out. It's in the connection info, however
+        #        not sure if it's all working yet so this remains commented out
         #if self._ipv6:
         #    ssh_cmd += ['-6']
         ssh_cmd += [self._host.ipv4_address]
@@ -436,6 +436,9 @@ class Connection(ConnectionBase):
 
         # FIXME: make a function, used in all 3 methods EXEC/PUT/FETCH
         host = self._host.ipv4_address
+
+        # FIXME: ipv6 stuff needs to be figured out. It's in the connection info, however
+        #        not sure if it's all working yet so this remains commented out
         #if self._ipv6:
         #    host = '[%s]' % host
 
@@ -463,6 +466,9 @@ class Connection(ConnectionBase):
 
         # FIXME: make a function, used in all 3 methods EXEC/PUT/FETCH
         host = self._host.ipv4_address
+
+        # FIXME: ipv6 stuff needs to be figured out. It's in the connection info, however
+        #        not sure if it's all working yet so this remains commented out
         #if self._ipv6:
         #    host = '[%s]' % self._host
 
diff --git a/v2/ansible/plugins/strategies/__init__.py b/v2/ansible/plugins/strategies/__init__.py
index 49cdca2ccf..be62328940 100644
--- a/v2/ansible/plugins/strategies/__init__.py
+++ b/v2/ansible/plugins/strategies/__init__.py
@@ -60,12 +60,26 @@ class StrategyBase:
         # outstanding tasks still in queue
         self._blocked_hosts     = dict()
 
-    def run(self, iterator, connection_info):
+    def run(self, iterator, connection_info, result=True):
+        # save the counts on failed/unreachable hosts, as the cleanup/handler
+        # methods will clear that information during their runs
+        num_failed      = len(self._tqm._failed_hosts)
+        num_unreachable = len(self._tqm._unreachable_hosts)
+
         debug("running the cleanup portion of the play")
-        result = self.cleanup(iterator, connection_info)
+        result &= self.cleanup(iterator, connection_info)
         debug("running handlers")
         result &= self.run_handlers(iterator, connection_info)
-        return result
+
+        if not result:
+            if num_unreachable > 0:
+                return 3
+            elif num_failed > 0:
+                return 2
+            else:
+                return 1
+        else:
+            return 0
 
     def get_hosts_remaining(self, play):
         return [host for host in self._inventory.get_hosts(play.hosts) if host.name not in self._tqm._failed_hosts and host.get_name() not in self._tqm._unreachable_hosts]
@@ -73,37 +87,10 @@ class StrategyBase:
     def get_failed_hosts(self):
         return [host for host in self._inventory.get_hosts() if host.name in self._tqm._failed_hosts]
 
-    def _queue_task(self, play, host, task, connection_info):
+    def _queue_task(self, host, task, task_vars, connection_info):
         ''' handles queueing the task up to be sent to a worker '''
 
-        debug("entering _queue_task() for %s/%s/%s" % (play, host, task))
-        # copy the task, to make sure we have a clean version, since the
-        # post-validation step will alter attribute values but this Task object
-        # is shared across all hosts in the play
-        debug("copying task")
-        new_task = task.copy()
-        debug("done copying task")
-
-        # squash variables down to a single dictionary using the variable manager and
-        # call post_validate() on the task, which will finalize the attribute values
-        debug("getting variables")
-        try:
-            task_vars = self._variable_manager.get_vars(loader=self._loader, play=play, host=host, task=new_task)
-        except EOFError:
-            # usually happens if the program is aborted, and the proxied object
-            # queue is cut off from the call, so we just ignore this and exit
-            return
-        debug("done getting variables")
-
-        debug("running post_validate() on the task")
-        if new_task.loop:
-            # if the task has a lookup loop specified, we do not error out
-            # on undefined variables yet, as fields may use {{item}} or some
-            # variant, which won't be defined until execution time
-            new_task.post_validate(task_vars, fail_on_undefined=False)
-        else:
-            new_task.post_validate(task_vars)
-        debug("done running post_validate() on the task")
+        debug("entering _queue_task() for %s/%s" % (host, task))
 
         # and then queue the new task
         debug("%s - putting task (%s) in queue" % (host, task))
@@ -116,12 +103,12 @@ class StrategyBase:
                 self._cur_worker = 0
 
             self._pending_results += 1
-            main_q.put((host, new_task, self._loader.get_basedir(), task_vars, connection_info), block=False)
+            main_q.put((host, task, self._loader.get_basedir(), task_vars, connection_info), block=False)
         except (EOFError, IOError, AssertionError), e:
             # most likely an abort
             debug("got an error while queuing: %s" % e)
             return
-        debug("exiting _queue_task() for %s/%s/%s" % (play, host, task))
+        debug("exiting _queue_task() for %s/%s" % (host, task))
 
     def _process_pending_results(self):
         '''
@@ -140,7 +127,8 @@ class StrategyBase:
                     host = task_result._host
                     task = task_result._task
                     if result[0] == 'host_task_failed':
-                        self._tqm._failed_hosts[host.get_name()] = True
+                        if not task.ignore_errors:
+                            self._tqm._failed_hosts[host.get_name()] = True
                         self._callback.runner_on_failed(task, task_result)
                     elif result[0] == 'host_unreachable':
                         self._tqm._unreachable_hosts[host.get_name()] = True
diff --git a/v2/ansible/plugins/strategies/free.py b/v2/ansible/plugins/strategies/free.py
index d570ce1dde..2828bff1bd 100644
--- a/v2/ansible/plugins/strategies/free.py
+++ b/v2/ansible/plugins/strategies/free.py
@@ -43,7 +43,7 @@ class StrategyModule(StrategyBase):
         last_host = 0      
 
         work_to_do = True
-        while work_to_do:
+        while work_to_do and not self._tqm._terminated:
 
             hosts_left = self.get_hosts_remaining()
             if len(hosts_left) == 0:
diff --git a/v2/ansible/plugins/strategies/linear.py b/v2/ansible/plugins/strategies/linear.py
index 9d7a15e533..f5625ec89b 100644
--- a/v2/ansible/plugins/strategies/linear.py
+++ b/v2/ansible/plugins/strategies/linear.py
@@ -36,7 +36,7 @@ class StrategyModule(StrategyBase):
 
         # iteratate over each task, while there is one left to run
         work_to_do = True
-        while work_to_do:
+        while work_to_do and not self._tqm._terminated:
 
             try:
                 debug("getting the remaining hosts for this loop")
@@ -52,7 +52,30 @@ class StrategyModule(StrategyBase):
                 callback_sent = False
                 work_to_do = False
                 for host in hosts_left:
-                    task = iterator.get_next_task_for_host(host)
+                    while True:
+                        task = iterator.get_next_task_for_host(host)
+                        if not task:
+                            break
+
+                        debug("getting variables")
+                        task_vars = self._variable_manager.get_vars(loader=self._loader, play=iterator._play, host=host, task=task)
+                        debug("done getting variables")
+
+                        # check to see if this task should be skipped, due to it being a member of a
+                        # role which has already run (and whether that role allows duplicate execution)
+                        if task._role and task._role.has_run():
+                            # If there is no metadata, the default behavior is to not allow duplicates,
+                            # if there is metadata, check to see if the allow_duplicates flag was set to true
+                            if task._role._metadata is None or task._role._metadata and not task._role._metadata.allow_duplicates:
+                                debug("'%s' skipped because role has already run" % task)
+                                continue
+
+                        if not task.evaluate_tags(connection_info.only_tags, connection_info.skip_tags, task_vars):
+                            debug("'%s' failed tag evaluation" % task)
+                            continue
+
+                        break
+
                     if not task:
                         continue
 
@@ -61,24 +84,21 @@ class StrategyModule(StrategyBase):
                         self._callback.playbook_on_task_start(task.get_name(), False)
                         callback_sent = True
 
-                    host_name = host.get_name()
-                    if 1: #host_name not in self._tqm._failed_hosts and host_name not in self._tqm._unreachable_hosts:
-                        self._blocked_hosts[host_name] = True
-                        self._queue_task(iterator._play, host, task, connection_info)
+                    self._blocked_hosts[host.get_name()] = True
+                    self._queue_task(host, task, task_vars, connection_info)
 
                     self._process_pending_results()
 
                 debug("done queuing things up, now waiting for results queue to drain")
                 self._wait_on_pending_results()
                 debug("results queue empty")
-            except IOError, e:
-                debug("got IOError: %s" % e)
+            except (IOError, EOFError), e:
+                debug("got IOError/EOFError in task loop: %s" % e)
                 # most likely an abort, return failed
                 return 1
 
         # run the base class run() method, which executes the cleanup function
         # and runs any outstanding handlers which have been triggered
 
-        result &= super(StrategyModule, self).run(iterator, connection_info)
+        return super(StrategyModule, self).run(iterator, connection_info, result)
 
-        return result
diff --git a/v2/ansible/template/__init__.py b/v2/ansible/template/__init__.py
index 1f139b899c..30696d4701 100644
--- a/v2/ansible/template/__init__.py
+++ b/v2/ansible/template/__init__.py
@@ -25,7 +25,7 @@ from jinja2.utils import concat as j2_concat
 from jinja2.runtime import StrictUndefined
 
 from ansible import constants as C
-from ansible.errors import *
+from ansible.errors import AnsibleError, AnsibleFilterError, AnsibleUndefinedVariable
 from ansible.plugins import filter_loader, lookup_loader
 from ansible.template.safe_eval import safe_eval
 from ansible.template.template import AnsibleJ2Template
@@ -266,7 +266,7 @@ class Templar:
                     res += '\n' * (data_newlines - res_newlines)
 
             return res
-        except UndefinedError, AnsibleUndefinedVariable:
+        except (UndefinedError, AnsibleUndefinedVariable), e:
             if self._fail_on_undefined_errors:
                 raise
             else:
diff --git a/v2/bin/ansible b/v2/bin/ansible
index f3cf131e3c..c51040c6a8 100755
--- a/v2/bin/ansible
+++ b/v2/bin/ansible
@@ -144,6 +144,7 @@ class Cli(object):
                 dict(action=dict(module=options.module_name, args=parse_kv(options.module_args))),
             ]
         )
+
         play = Play().load(play_ds, variable_manager=variable_manager, loader=loader)
 
         # now create a task queue manager to execute the play
@@ -155,7 +156,7 @@ class Cli(object):
             tqm.cleanup()
             raise
 
-        return (result, len(tqm._failed_hosts), len(tqm._unreachable_hosts))
+        return result
 
     # ----------------------------------------------
 
@@ -179,12 +180,7 @@ if __name__ == '__main__':
     try:
         cli = Cli()
         (options, args) = cli.parse()
-        (result, num_failed, num_unreachable) = cli.run(options, args)
-        if not result:
-            if num_failed > 0:
-                sys.exit(2)
-            elif num_unreachable > 0:
-                sys.exit(3)
+        result = cli.run(options, args)
         
     except AnsibleError, e:
         print(e)
@@ -195,3 +191,4 @@ if __name__ == '__main__':
         print("ERROR: %s" % str(e))
         sys.exit(1)
 
+    sys.exit(result)
diff --git a/v2/bin/ansible-playbook b/v2/bin/ansible-playbook
index 4cee0ca720..e7a6093973 100755
--- a/v2/bin/ansible-playbook
+++ b/v2/bin/ansible-playbook
@@ -143,7 +143,7 @@ def main(args):
     # create the playbook executor, which manages running the plays
     # via a task queue manager
     pbex = PlaybookExecutor(playbooks=args, inventory=inventory, variable_manager=variable_manager, loader=loader, options=options)
-    pbex.run()
+    return pbex.run()
 
 if __name__ == "__main__":
     #display(" ", log_only=True)
diff --git a/v2/samples/ignore_errors.yml b/v2/samples/ignore_errors.yml
new file mode 100644
index 0000000000..5845d049c4
--- /dev/null
+++ b/v2/samples/ignore_errors.yml
@@ -0,0 +1,10 @@
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
+  - fail:
+    ignore_errors: yes
+  - debug: msg="you should still see this"
+  - fail:
+  - debug: msg="you should NOT see this"
+