diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index 65d61c044c..913fd95d55 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -1,15 +1,47 @@
 /// <reference path="visitor.ts" />
+/// <reference path="transformers/ts.ts" />
+/// <reference path="transformers/jsx.ts" />
+/// <reference path="transformers/es7.ts" />
+/// <reference path="transformers/es6.ts" />
+/// <reference path="transformers/module/module.ts" />
+/// <reference path="transformers/module/system.ts" />
+/// <reference path="transformers/module/es6.ts" />
 
 /* @internal */
 namespace ts {
+    const moduleTransformerMap: Map<Transformer> = {
+        [ModuleKind.ES6]: transformES6Module,
+        [ModuleKind.System]: transformSystemModule,
+        [ModuleKind.AMD]: transformModule,
+        [ModuleKind.CommonJS]: transformModule,
+        [ModuleKind.UMD]: transformModule,
+        [ModuleKind.None]: transformModule,
+    };
+
     const enum SyntaxKindFeatureFlags {
         ExpressionSubstitution = 1 << 0,
         EmitNotifications = 1 << 1,
     }
 
     export function getTransformers(compilerOptions: CompilerOptions) {
+        const jsx = compilerOptions.jsx;
+        const languageVersion = getEmitScriptTarget(compilerOptions);
+        const moduleKind = getEmitModuleKind(compilerOptions);
         const transformers: Transformer[] = [];
-        // TODO(rbuckton): Add transformers
+
+        transformers.push(transformTypeScript);
+        transformers.push(moduleTransformerMap[moduleKind]);
+
+        if (jsx === JsxEmit.React) {
+            transformers.push(transformJsx);
+        }
+
+        transformers.push(transformES7);
+
+        if (languageVersion < ScriptTarget.ES6) {
+            transformers.push(transformES6);
+        }
+
         return transformers;
     }
 
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 8618e71f92..e6572ee870 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -6,7 +6,6 @@
 namespace ts {
     type SuperContainer = ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration;
 
-    // TODO(rbuckton): TS->ES7 transformer
     export function transformTypeScript(context: TransformationContext) {
         const {
             nodeHasGeneratedName,
@@ -38,7 +37,6 @@ namespace ts {
         let currentScope: SourceFile | Block | ModuleBlock | CaseBlock;
         let currentParent: Node;
         let currentNode: Node;
-        let isRightmostExpression: boolean;
         let superContainerStack: SuperContainer[];
 
         return transformSourceFile;
@@ -47,7 +45,6 @@ namespace ts {
             currentSourceFile = node;
             node = visitEachChild(node, visitor, context);
             setNodeEmitFlags(node, NodeEmitFlags.EmitEmitHelpers);
-            currentSourceFile = undefined;
             return node;
         }
 
@@ -61,14 +58,12 @@ namespace ts {
             const savedCurrentScope = currentScope;
             const savedCurrentParent = currentParent;
             const savedCurrentNode = currentNode;
-            const savedIsRightmostExpression = isRightmostExpression;
             onBeforeVisitNode(node);
             node = visitor(node);
             currentNamespace = savedCurrentNamespace;
             currentScope = savedCurrentScope;
             currentParent = savedCurrentParent;
             currentNode = savedCurrentNode;
-            isRightmostExpression = savedIsRightmostExpression;
             return node;
         }
 
@@ -334,11 +329,6 @@ namespace ts {
                     currentScope = <SourceFile | CaseBlock | ModuleBlock | Block>node;
                     break;
             }
-
-            // Keep track of whether this is the right-most expression of an expression tree.
-            // This is used to determine whether to parenthesize an `await` expression transformed
-            // into a `yield` expression.
-            isRightmostExpression = currentParent && isRightmost(currentParent, currentNode, isRightmostExpression);
         }
 
         /**
@@ -567,7 +557,7 @@ namespace ts {
          *
          * @param node The node to transform.
          */
-        function visitClassExpression(node: ClassExpression): LeftHandSideExpression {
+        function visitClassExpression(node: ClassExpression): Expression {
             const staticProperties = getInitializedProperties(node, /*isStatic*/ true);
             const heritageClauses = visitNodes(node.heritageClauses, visitor, isHeritageClause);
             const members = transformClassMembers(node, heritageClauses !== undefined);
@@ -598,7 +588,7 @@ namespace ts {
                 addNode(expressions, createAssignment(temp, classExpression));
                 addNodes(expressions, generateInitializedPropertyExpressions(node, staticProperties, temp));
                 addNode(expressions, temp);
-                return createParen(inlineExpressions(expressions));
+                return inlineExpressions(expressions);
             }
 
             return classExpression;
@@ -2229,12 +2219,10 @@ namespace ts {
          * @param node The await expression node.
          */
         function visitAwaitExpression(node: AwaitExpression): Expression {
-            const expression = createYield(
+            return createYield(
                 visitNode(node.expression, visitor, isExpression),
                 node
             );
-
-            return isRightmostExpression ? expression : createParen(expression);
         }
 
         /**
@@ -2690,48 +2678,5 @@ namespace ts {
                 }
             }
         }
-
-        function isRightmost(parentNode: Node, node: Node, wasRightmost: boolean) {
-            switch (parentNode.kind) {
-                case SyntaxKind.VariableDeclaration:
-                case SyntaxKind.Parameter:
-                case SyntaxKind.BindingElement:
-                case SyntaxKind.PropertyDeclaration:
-                case SyntaxKind.PropertyAssignment:
-                case SyntaxKind.ShorthandPropertyAssignment:
-                case SyntaxKind.ExpressionStatement:
-                case SyntaxKind.ArrayLiteralExpression:
-                case SyntaxKind.ThrowStatement:
-                case SyntaxKind.ReturnStatement:
-                case SyntaxKind.ForStatement:
-                case SyntaxKind.ForOfStatement:
-                case SyntaxKind.ForInStatement:
-                case SyntaxKind.DoStatement:
-                case SyntaxKind.WhileStatement:
-                case SyntaxKind.SwitchStatement:
-                case SyntaxKind.CaseClause:
-                case SyntaxKind.WithStatement:
-                case SyntaxKind.Decorator:
-                case SyntaxKind.ExpressionWithTypeArguments:
-                case SyntaxKind.SpreadElementExpression:
-                case SyntaxKind.AsExpression:
-                case SyntaxKind.TypeAssertionExpression:
-                case SyntaxKind.EnumMember:
-                case SyntaxKind.JsxAttribute:
-                case SyntaxKind.JsxSpreadAttribute:
-                case SyntaxKind.JsxExpression:
-                    return true;
-                case SyntaxKind.TemplateSpan:
-                case SyntaxKind.CallExpression:
-                case SyntaxKind.NewExpression:
-                    return node !== (<CallExpression | NewExpression>parentNode).expression;
-                case SyntaxKind.BinaryExpression:
-                    return wasRightmost && node === (<BinaryExpression>parentNode).right;
-                case SyntaxKind.ConditionalExpression:
-                    return wasRightmost && node === (<ConditionalExpression>parentNode).whenTrue;
-                default:
-                    return wasRightmost;
-            }
-        }
     }
 }
\ No newline at end of file