diff --git a/analyzer_plugin/lib/src/angular_driver.dart b/analyzer_plugin/lib/src/angular_driver.dart
index e7a14a35..f5c61d3e 100644
--- a/analyzer_plugin/lib/src/angular_driver.dart
+++ b/analyzer_plugin/lib/src/angular_driver.dart
@@ -45,9 +45,10 @@ class AngularDriver
   final _addedFiles = new LinkedHashSet<String>();
   final _dartFiles = new LinkedHashSet<String>();
   final _changedFiles = new LinkedHashSet<String>();
-  final _requestedFiles = new HashSet<String>();
+  final _requestedDartFiles = new Map<String, List<Completer>>();
+  final _requestedHtmlFiles = new Map<String, List<Completer>>();
   final _filesToAnalyze = new HashSet<String>();
-  final _htmlViewsToAnalyze = new HashSet<Tuple2<String, String>>();
+  final _htmlFilesToAnalyze = new HashSet<String>();
   final ByteStore byteStore;
   FileTracker _fileTracker;
   final lastSignatures = <String, String>{};
@@ -66,7 +67,10 @@ class AngularDriver
   }
 
   bool get hasFilesToAnalyze =>
-      _filesToAnalyze.isNotEmpty || _htmlViewsToAnalyze.isNotEmpty;
+      _filesToAnalyze.isNotEmpty ||
+      _htmlFilesToAnalyze.isNotEmpty ||
+      _requestedDartFiles.isNotEmpty ||
+      _requestedHtmlFiles.isNotEmpty;
 
   bool _ownsFile(String path) {
     return path.endsWith('.dart') || path.endsWith('.html');
@@ -85,15 +89,9 @@ class AngularDriver
   void fileChanged(String path) {
     if (_ownsFile(path)) {
       if (path.endsWith('.html')) {
-        for (final dartContext
-            in _fileTracker.getDartPathsReferencingHtml(path)) {
-          _htmlViewsToAnalyze.add(new Tuple2(path, dartContext));
-        }
+        _htmlFilesToAnalyze.add(path);
         for (final path in _fileTracker.getHtmlPathsReferencingHtml(path)) {
-          for (final dartContext
-              in _fileTracker.getDartPathsReferencingHtml(path)) {
-            _htmlViewsToAnalyze.add(new Tuple2(path, dartContext));
-          }
+          _htmlFilesToAnalyze.add(path);
         }
         for (final path in _fileTracker.getDartPathsAffectedByHtml(path)) {
           _filesToAnalyze.add(path);
@@ -105,19 +103,38 @@ class AngularDriver
     _scheduler.notify(this);
   }
 
+  Future<List<AnalysisError>> requestDartErrors(String path) {
+    var completer = new Completer<List<AnalysisError>>();
+    _requestedDartFiles
+        .putIfAbsent(path, () => <Completer<List<AnalysisError>>>[])
+        .add(completer);
+    _scheduler.notify(this);
+    return completer.future;
+  }
+
+  Future<List<AnalysisError>> requestHtmlErrors(String path) {
+    var completer = new Completer<List<AnalysisError>>();
+    _requestedHtmlFiles
+        .putIfAbsent(path, () => <Completer<List<AnalysisError>>>[])
+        .add(completer);
+    _scheduler.notify(this);
+    return completer.future;
+  }
+
   AnalysisDriverPriority get workPriority {
     if (standardHtml == null) {
       return AnalysisDriverPriority.interactive;
     }
-
-    if (_requestedFiles.isNotEmpty) {
+    if (_requestedDartFiles.isNotEmpty) {
+      return AnalysisDriverPriority.interactive;
+    }
+    if (_requestedHtmlFiles.isNotEmpty) {
       return AnalysisDriverPriority.interactive;
     }
-    // tasks here?
     if (_filesToAnalyze.isNotEmpty) {
       return AnalysisDriverPriority.general;
     }
-    if (_htmlViewsToAnalyze.isNotEmpty) {
+    if (_htmlFilesToAnalyze.isNotEmpty) {
       return AnalysisDriverPriority.general;
     }
     if (_changedFiles.isNotEmpty) {
@@ -138,16 +155,49 @@ class AngularDriver
       return;
     }
 
-    if (_requestedFiles.isNotEmpty) {
-      final path = _requestedFiles.first;
-      try {
-        pushDartErrors(path);
-        pushDartNavigation(path);
-        pushDartOccurrences(path);
-        _requestedFiles.remove(path);
-      } catch (e) {
-        e;
+    if (_requestedDartFiles.isNotEmpty) {
+      final path = _requestedDartFiles.keys.first;
+      final completers = _requestedDartFiles.remove(path);
+      // Note: We can't use await here, or the dart analysis becomes a future in
+      // a queue that won't be completed until the scheduler schedules the dart
+      // driver, which doesn't happen because its waiting for us.
+      resolveDart(path, onlyIfChangedSignature: false).then((result) {
+        completers
+            .forEach((completer) => completer.complete(result?.errors ?? []));
+      }, onError: (e) {
+        completers.forEach((completer) => completer.completeError(e));
+      });
+
+      return;
+    }
+
+    if (_requestedHtmlFiles.isNotEmpty) {
+      final path = _requestedHtmlFiles.keys.first;
+      final completers = _requestedHtmlFiles.remove(path);
+      // Note: We can't use await here, or the dart analysis becomes a future in
+      // a queue that won't be completed until the scheduler schedules the dart
+      // driver, which doesn't happen because its waiting for us.
+      // ALSO assume .dart and .html paths correlate, otherwise we'd have to
+      // wait for all dart analysis to complete.
+      Future resolvedHtml;
+
+      // Try resolving HTML using the existing dart/html relationships which may
+      // be already known. However, if we don't see any relationships, try using
+      // the .dart equivalent. Better than no result -- the real one WILL come.
+      if (_fileTracker.getDartPathsReferencingHtml(path).isEmpty) {
+        resolvedHtml = resolveHtmlFrom(path, path.replaceAll(".html", ".dart"));
+      } else {
+        resolvedHtml = resolveHtml(path);
       }
+
+      // After whichever resolution is complete, push errors.
+      resolvedHtml.then((result) {
+        completers
+            .forEach((completer) => completer.complete(result?.errors ?? []));
+      }, onError: (e) {
+        completers.forEach((completer) => completer.completeError(e));
+      });
+
       return;
     }
 
@@ -158,10 +208,10 @@ class AngularDriver
       return;
     }
 
-    if (_htmlViewsToAnalyze.isNotEmpty) {
-      final info = _htmlViewsToAnalyze.first;
-      pushHtmlErrors(info.item1, info.item2);
-      _htmlViewsToAnalyze.remove(info);
+    if (_htmlFilesToAnalyze.isNotEmpty) {
+      final path = _htmlFilesToAnalyze.first;
+      pushHtmlErrors(path);
+      _htmlFilesToAnalyze.remove(path);
       return;
     }
 
@@ -221,8 +271,8 @@ class AngularDriver
         errorCode, error.message, error.correction);
   }
 
-  String getHtmlKey(String htmlPath, String dartPath) {
-    final key = _fileTracker.getHtmlSignature(htmlPath, dartPath);
+  String getHtmlKey(String htmlPath) {
+    final key = _fileTracker.getHtmlSignature(htmlPath);
     return key.toHex() + '.ngresolved';
   }
 
@@ -239,8 +289,8 @@ class AngularDriver
             source.exists() ? source.contents.data : "")(getSource(path));
   }
 
-  Future<DirectivesResult> resolveHtml(String htmlPath, String dartPath) async {
-    final key = getHtmlKey(htmlPath, dartPath);
+  Future<DirectivesResult> resolveHtml(String htmlPath) async {
+    final key = getHtmlKey(htmlPath);
     final htmlSource = _sourceFactory.forUri("file:" + htmlPath);
     final List<int> bytes = byteStore.get(key);
     if (bytes != null) {
@@ -251,9 +301,36 @@ class AngularDriver
       return new DirectivesResult([], errors);
     }
 
+    final result = new DirectivesResult([], []);
+
+    for (final dartContext
+        in _fileTracker.getDartPathsReferencingHtml(htmlPath)) {
+      final pairResult = await resolveHtmlFrom(htmlPath, dartContext);
+      result.directives.addAll(pairResult.directives);
+      result.errors.addAll(pairResult.errors);
+    }
+
+    final summary = new LinkedHtmlSummaryBuilder()
+      ..errors = summarizeErrors(
+          result.errors.where((error) => error is! FromFilePrefixedError))
+      ..errorsFromPath = result.errors
+          .where((error) => error is FromFilePrefixedError)
+          .map((error) => new SummarizedAnalysisErrorFromPathBuilder()
+            ..path = (error as FromFilePrefixedError).fromSourcePath
+            ..originalError =
+                summarizeError((error as FromFilePrefixedError).originalError));
+    final List<int> newBytes = summary.toBuffer();
+    byteStore.put(key, newBytes);
+
+    return result;
+  }
+
+  Future<DirectivesResult> resolveHtmlFrom(
+      String htmlPath, String dartPath) async {
     final result = await getDirectives(dartPath);
     final directives = result.directives;
     final unit = (await dartDriver.getUnitElement(dartPath)).element;
+    final htmlSource = _sourceFactory.forUri("file:" + htmlPath);
 
     if (unit == null) return null;
     final context = unit.context;
@@ -318,17 +395,6 @@ class AngularDriver
       }
     }
 
-    final summary = new LinkedHtmlSummaryBuilder()
-      ..errors = summarizeErrors(
-          errors.where((error) => error is! FromFilePrefixedError))
-      ..errorsFromPath = errors
-          .where((error) => error is FromFilePrefixedError)
-          .map((error) => new SummarizedAnalysisErrorFromPathBuilder()
-            ..path = (error as FromFilePrefixedError).fromSourcePath
-            ..originalError =
-                summarizeError((error as FromFilePrefixedError).originalError));
-    final List<int> newBytes = summary.toBuffer();
-    byteStore.put(key, newBytes);
     return new DirectivesResult(directives, errors);
   }
 
@@ -364,8 +430,8 @@ class AngularDriver
     return contents;
   }
 
-  Future pushHtmlErrors(String htmlPath, String dartPath) async {
-    final errors = (await resolveHtml(htmlPath, dartPath)).errors;
+  Future pushHtmlErrors(String htmlPath) async {
+    final errors = (await resolveHtml(htmlPath)).errors;
     final lineInfo = new LineInfo.fromContent(getFileContent(htmlPath));
     final serverErrors = protocol.doAnalysisError_listFromEngine(
         dartDriver.analysisOptions, lineInfo, errors);
@@ -389,7 +455,7 @@ class AngularDriver
   }
 
   Future<DirectivesResult> resolveDart(String path,
-      {bool withDirectives: false}) async {
+      {bool withDirectives: false, bool onlyIfChangedSignature: true}) async {
     final baseKey = await dartDriver.getUnitElementSignature(path);
 
     // This happens when the path is..."hidden by a generated file"..whch I
@@ -402,7 +468,7 @@ class AngularDriver
 
     final key = baseKey + '.ngresolved';
 
-    if (lastSignatures[path] == key) {
+    if (lastSignatures[path] == key && onlyIfChangedSignature) {
       return null;
     }
 
@@ -413,8 +479,8 @@ class AngularDriver
       if (bytes != null) {
         final summary = new LinkedDartSummary.fromBuffer(bytes);
 
-        for (final htmlView in summary.referencedHtmlFiles) {
-          _htmlViewsToAnalyze.add(new Tuple2(htmlView, path));
+        for (final htmlPath in summary.referencedHtmlFiles) {
+          _htmlFilesToAnalyze.add(htmlPath);
         }
 
         _fileTracker.setDartHasTemplate(path, summary.hasDartTemplates);
@@ -480,8 +546,7 @@ class AngularDriver
           errors.addAll(tplErrorListener.errors.where(
               (e) => !view.template.ignoredErrors.contains(e.errorCode.name)));
         } else if (view?.templateUriSource != null) {
-          _htmlViewsToAnalyze
-              .add(new Tuple2(view.templateUriSource.fullName, path));
+          _htmlFilesToAnalyze.add(view.templateUriSource.fullName);
           htmlViews.add(view.templateUriSource.fullName);
         }
 
diff --git a/analyzer_plugin/lib/src/file_tracker.dart b/analyzer_plugin/lib/src/file_tracker.dart
index 0f069756..85a6b899 100644
--- a/analyzer_plugin/lib/src/file_tracker.dart
+++ b/analyzer_plugin/lib/src/file_tracker.dart
@@ -83,12 +83,15 @@ class FileTracker {
     return signature;
   }
 
-  ApiSignature getHtmlSignature(String htmlPath, String dartPath) {
+  ApiSignature getHtmlSignature(String htmlPath) {
     final signature = new ApiSignature();
     signature.addBytes(_fileHasher.getContentHash(htmlPath).toByteList());
-    signature.addBytes(_fileHasher.getUnitElementHash(dartPath).toByteList());
-    for (final subHtmlPath in getHtmlPathsAffectingDartContext(dartPath)) {
-      signature.addBytes(_fileHasher.getContentHash(subHtmlPath).toByteList());
+    for (final dartPath in getDartPathsReferencingHtml(htmlPath)) {
+      signature.addBytes(_fileHasher.getUnitElementHash(dartPath).toByteList());
+      for (final subHtmlPath in getHtmlPathsAffectingDartContext(dartPath)) {
+        signature
+            .addBytes(_fileHasher.getContentHash(subHtmlPath).toByteList());
+      }
     }
     return signature;
   }
diff --git a/analyzer_plugin/lib/starter.dart b/analyzer_plugin/lib/starter.dart
new file mode 100644
index 00000000..d39e131e
--- /dev/null
+++ b/analyzer_plugin/lib/starter.dart
@@ -0,0 +1,69 @@
+import 'package:analysis_server/src/analysis_server.dart';
+import 'package:analyzer/src/generated/source.dart';
+import 'package:angular_analyzer_plugin/src/angular_driver.dart';
+import 'package:analyzer/src/context/builder.dart';
+
+class Starter {
+  final angularDrivers = <String, AngularDriver>{};
+  AnalysisServer server;
+
+  void start(AnalysisServer server) {
+    this.server = server;
+    ContextBuilder.onCreateAnalysisDriver = onCreateAnalysisDriver;
+    server.onResultErrorSupplementor = sumErrors;
+    server.onNoAnalysisResult = sendHtmlResult;
+  }
+
+  void onCreateAnalysisDriver(
+      analysisDriver,
+      scheduler,
+      logger,
+      resourceProvider,
+      byteStore,
+      contentOverlay,
+      driverPath,
+      sourceFactory,
+      analysisOptions) {
+    final AngularDriver driver = new AngularDriver(server, analysisDriver,
+        scheduler, byteStore, sourceFactory, contentOverlay);
+    angularDrivers[driverPath] = driver;
+    server.onFileAdded.listen((String path) {
+      if (server.contextManager.getContextFolderFor(path).path == driverPath) {
+        // only the owning driver "adds" the path
+        driver.addFile(path);
+      } else {
+        // but the addition of a file is a "change" to all the other drivers
+        driver.fileChanged(path);
+      }
+    });
+    server.onFileChanged.listen((String path) {
+      // all drivers get change notification
+      driver.fileChanged(path);
+    });
+  }
+
+  Future sumErrors(String path, List<AnalysisError> errors) async {
+    for (final driver in angularDrivers.values) {
+      final angularErrors = await driver.requestDartErrors(path);
+      errors.addAll(angularErrors);
+    }
+    return null;
+  }
+
+  Future sendHtmlResult(String path, Function sendFn) async {
+    for (final driverPath in angularDrivers.keys) {
+      if (server.contextManager.getContextFolderFor(path).path == driverPath) {
+        final driver = angularDrivers[driverPath];
+        // only the owning driver "adds" the path
+        final angularErrors = await driver.requestHtmlErrors(path);
+        sendFn(
+            driver.dartDriver.analysisOptions,
+            new LineInfo.fromContent(driver.getFileContent(path)),
+            angularErrors);
+        return;
+      }
+    }
+
+    send(null, null, null);
+  }
+}
diff --git a/analyzer_plugin/test/angular_driver_test.dart b/analyzer_plugin/test/angular_driver_test.dart
index 4216d8d5..94485c6b 100644
--- a/analyzer_plugin/test/angular_driver_test.dart
+++ b/analyzer_plugin/test/angular_driver_test.dart
@@ -2328,31 +2328,30 @@ class ChildComponent {}
 @reflectiveTest
 class ResolveHtmlTemplatesTest extends AbstractAngularTest {
   List<Template> templates;
-  Future getDirectives(Source dartSource) async {
-    final result = await angularDriver.resolveDart(dartSource.fullName);
-    final finder = (AbstractDirective d) =>
-        d is Component && d.view.templateUriSource != null;
-    fillErrorListener(result.errors);
-    final directives = result.directives.where(finder);
-    final htmlPath =
-        (directives.first as Component).view.templateUriSource.fullName;
-    final result2 =
-        await angularDriver.resolveHtml(htmlPath, dartSource.fullName);
+  Future getDirectives(Source htmlSource, List<Source> dartSources) async {
+    for (final dartSource in dartSources) {
+      final result = await angularDriver.resolveDart(dartSource.fullName);
+      fillErrorListener(result.errors);
+    }
+    final result2 = await angularDriver.resolveHtml(htmlSource.fullName);
     fillErrorListener(result2.errors);
     templates = result2.directives
-        .where(finder)
         .map((d) => d is Component ? d.view?.template : null)
         .where((d) => d != null);
   }
 
   Future test_multipleViewsWithTemplate() async {
-    String dartCode = r'''
+    String dartCodeOne = r'''
 import '/angular2/angular2.dart';
 
 @Component(selector: 'text-panelA', templateUrl: 'text_panel.html')
 class TextPanelA {
   String text; // A
 }
+''';
+
+    String dartCodeTwo = r'''
+import '/angular2/angular2.dart';
 
 @Component(selector: 'text-panelB', templateUrl: 'text_panel.html')
 class TextPanelB {
@@ -2364,23 +2363,24 @@ class TextPanelB {
   {{text}}
 </div>
 """;
-    Source dartSource = newSource('/test.dart', dartCode);
-    newSource('/text_panel.html', htmlCode);
-    await getDirectives(dartSource);
+    Source dartSourceOne = newSource('/test1.dart', dartCodeOne);
+    Source dartSourceTwo = newSource('/test2.dart', dartCodeTwo);
+    Source htmlSource = newSource('/text_panel.html', htmlCode);
+    await getDirectives(htmlSource, [dartSourceOne, dartSourceTwo]);
     expect(templates, hasLength(2));
     // validate templates
     bool hasTextPanelA = false;
     bool hasTextPanelB = false;
     for (HtmlTemplate template in templates) {
       String viewClassName = template.view.classElement.name;
-      String textTargetPattern;
+      int textLocation;
       if (viewClassName == 'TextPanelA') {
         hasTextPanelA = true;
-        textTargetPattern = 'text; // A';
+        textLocation = dartCodeOne.indexOf('text; // A');
       }
       if (viewClassName == 'TextPanelB') {
         hasTextPanelB = true;
-        textTargetPattern = 'text; // B';
+        textLocation = dartCodeTwo.indexOf('text; // B');
       }
       expect(template.ranges, hasLength(1));
       {
@@ -2388,7 +2388,7 @@ class TextPanelB {
             getResolvedRangeAtString(htmlCode, template.ranges, 'text}}');
         PropertyAccessorElement element = assertGetter(resolvedRange);
         expect(element.name, 'text');
-        expect(element.nameOffset, dartCode.indexOf(textTargetPattern));
+        expect(element.nameOffset, textLocation);
       }
     }
     expect(hasTextPanelA, isTrue);
@@ -2399,20 +2399,14 @@ class TextPanelB {
 @reflectiveTest
 class ResolveHtmlTemplateTest extends AbstractAngularTest {
   List<View> views;
-  Future getDirectives(Source dartSource) async {
+  Future getDirectives(Source htmlSource, Source dartSource) async {
     final result = await angularDriver.resolveDart(dartSource.fullName);
-    final finder = (AbstractDirective d) =>
-        d is Component && d.view.templateUriSource != null;
     fillErrorListener(result.errors);
-    final directive = result.directives.singleWhere(finder);
-    final htmlPath = (directive as Component).view.templateUriSource.fullName;
-    final ngResult =
-        await angularDriver.resolveHtml(htmlPath, dartSource.fullName);
-    fillErrorListener(ngResult.errors);
-    views = ngResult.directives
-        .where(finder)
+    final result2 = await angularDriver.resolveHtml(htmlSource.fullName);
+    fillErrorListener(result2.errors);
+    views = result2.directives
         .map((d) => d is Component ? d.view : null)
-        .where((d) => d != null);
+        .where((v) => v != null);
   }
 
   Future test_suppressError_UnresolvedTagHtmlTemplate() async {
@@ -2425,13 +2419,13 @@ import '/angular2/angular2.dart';
 class ComponentA {
 }
 ''');
-    newSource(
+    Source htmlSource = newSource(
         '/test.html',
         '''
 <!-- @ngIgnoreErrors: UNRESOLVED_TAG -->
 <unresolved-tag attr='value'></unresolved-tag>""")
 ''');
-    await getDirectives(dartSource);
+    await getDirectives(htmlSource, dartSource);
     errorListener.assertNoErrors();
   }
 
@@ -2444,8 +2438,9 @@ class ComponentA {
 }
 ''';
     Source dartSource = newSource('/weird.dart', code);
-    newSource('/test.html', "<unresolved-tag></unresolved-tag>");
-    await getDirectives(dartSource);
+    Soruce htmlSource =
+        newSource('/test.html', "<unresolved-tag></unresolved-tag>");
+    await getDirectives(htmlSource, dartSource);
     final errors = errorListener.errors;
     expect(errors, hasLength(1));
     expect(errors.first, new isInstanceOf<FromFilePrefixedError>());
@@ -2468,9 +2463,9 @@ class TextPanel {
 </div>
 """;
     Source dartSource = newSource('/test.dart', dartCode);
-    newSource('/text_panel.html', htmlCode);
+    Source htmlSource = newSource('/text_panel.html', htmlCode);
     // compute
-    await getDirectives(dartSource);
+    await getDirectives(htmlSource, dartSource);
     expect(views, hasLength(1));
     {
       View view = getViewByClassName(views, 'TextPanel');
@@ -2507,10 +2502,10 @@ import '/angular2/angular2.dart';
     directives: const [])
 class ChildComponent {}
 ''';
-    Source source = newSource('/test.dart', code);
+    Source dartSource = newSource('/test.dart', code);
     newSource('/child_file.dart', childCode);
-    newSource('/test.html', '');
-    await getDirectives(source);
+    Source htmlSource = newSource('/test.html', '');
+    await getDirectives(htmlSource, dartSource);
 
     List<AbstractDirective> childDirectives = views.first.directives;
     expect(childDirectives, hasLength(1));
diff --git a/analyzer_plugin/test/file_tracker_test.dart b/analyzer_plugin/test/file_tracker_test.dart
index d4566a40..7e7b69d6 100644
--- a/analyzer_plugin/test/file_tracker_test.dart
+++ b/analyzer_plugin/test/file_tracker_test.dart
@@ -279,16 +279,10 @@ class FileTrackerTest {
     expectedSignature.addBytes(fooHtmlSignature.toByteList());
     expectedSignature.addBytes(fooDartElementSignature.toByteList());
     expectedSignature.addBytes(barHtmlSignature.toByteList());
+    expectedSignature.addBytes(fooTestDartElementSignature.toByteList());
 
-    expect(_fileTracker.getHtmlSignature("foo.html", "foo.dart").toHex(),
+    expect(_fileTracker.getHtmlSignature("foo.html").toHex(),
         equals(expectedSignature.toHex()));
-
-    ApiSignature expectedTestSignature = new ApiSignature();
-    expectedTestSignature.addBytes(fooHtmlSignature.toByteList());
-    expectedTestSignature.addBytes(fooTestDartElementSignature.toByteList());
-
-    expect(_fileTracker.getHtmlSignature("foo.html", "foo_test.dart").toHex(),
-        equals(expectedTestSignature.toHex()));
   }
 }
 
diff --git a/analyzer_plugin/test/resolver_test.dart b/analyzer_plugin/test/resolver_test.dart
index cdff4d56..6259baee 100644
--- a/analyzer_plugin/test/resolver_test.dart
+++ b/analyzer_plugin/test/resolver_test.dart
@@ -2993,8 +2993,7 @@ $code
     fillErrorListener(result.errors);
     final directive = result.directives.singleWhere(finder);
     final htmlPath = (directive as Component).view.templateUriSource.fullName;
-    final result2 =
-        await angularDriver.resolveHtml(htmlPath, dartSource.fullName);
+    final result2 = await angularDriver.resolveHtml(htmlPath);
     fillErrorListener(result2.errors);
     final view = (result2.directives.singleWhere(finder) as Component).view;
 
diff --git a/server_plugin/bin/server.dart b/server_plugin/bin/server.dart
index 0eff301c..2026dfb7 100644
--- a/server_plugin/bin/server.dart
+++ b/server_plugin/bin/server.dart
@@ -4,8 +4,7 @@
 
 import 'package:analysis_server/starter.dart';
 
-import 'package:angular_analyzer_plugin/src/angular_driver.dart';
-import 'package:analyzer/src/context/builder.dart';
+import 'package:angular_analyzer_plugin/starter.dart' as ng;
 //import 'package:angular_analyzer_server_plugin/plugin.dart';
 import 'package:plugin/plugin.dart';
 
@@ -20,29 +19,5 @@ void main(List<String> args) {
   ];
   final server = starter.start(args);
 
-  ContextBuilder.onCreateAnalysisDriver = (analysisDriver,
-      scheduler,
-      logger,
-      resourceProvider,
-      byteStore,
-      contentOverlay,
-      driverPath,
-      sourceFactory,
-      analysisOptions) {
-    final AngularDriver driver = new AngularDriver(server, analysisDriver,
-        scheduler, byteStore, sourceFactory, contentOverlay);
-    server.onFileAdded.listen((String path) {
-      if (server.contextManager.getContextFolderFor(path).path == driverPath) {
-        // only the owning driver "adds" the path
-        driver.addFile(path);
-      } else {
-        // but the addition of a file is a "change" to all the other drivers
-        driver.fileChanged(path);
-      }
-    });
-    server.onFileChanged.listen((String path) {
-      // all drivers get change notification
-      driver.fileChanged(path);
-    });
-  };
+  new ng.Starter().start(server);
 }