diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e644f5a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Jaime Blasco 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/flutter-package/LICENSE b/flutter-package/LICENSE
index ba75c69..e644f5a 100644
--- a/flutter-package/LICENSE
+++ b/flutter-package/LICENSE
@@ -1 +1,21 @@
-TODO: Add your license here.
+MIT License
+
+Copyright (c) 2020 Jaime Blasco 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/flutter-package/bin/daemon_service.dart b/flutter-package/bin/daemon_service.dart
new file mode 100644
index 0000000..e420ffa
--- /dev/null
+++ b/flutter-package/bin/daemon_service.dart
@@ -0,0 +1,136 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:json_rpc_2/json_rpc_2.dart';
+import 'package:stream_channel/stream_channel.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+import 'preview.dart';
+
+class DaemonService extends MultiplePeer {
+  final int port;
+  DaemonService(this.port);
+
+  @override
+  registerMethods(Peer server) {
+    server.registerMethod('preview.getPort', () {
+      return port;
+    });
+
+    server.registerMethod('preview.setActiveFile', (Parameters params) {
+      final path = params['path'].asString;
+      changeActiveFile(path);
+      return true;
+    });
+
+    server.registerMethod('preview.restart', (Parameters params) {
+      _server.sendNotification('preview.restart');
+      return true;
+    });
+  }
+}
+
+class Stoutsink extends StreamSink<String> {
+  @override
+  void add(String event) {
+    stdout.writeln(event);
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    stdout.addError(error, stackTrace);
+  }
+
+  @override
+  Future addStream(Stream<String> stream) {
+    return stdout.addStream(stream.transform(Utf8Encoder()));
+  }
+
+  @override
+  Future close() {
+    return stdout.close();
+  }
+
+  @override
+  Future get done => stdout.close();
+}
+
+abstract class MultiplePeer {
+  Peer _server;
+  Map<WebSocketChannel, Peer> sockets = {};
+
+  //StreamChannel<String> _socket;
+
+  bool isListening = false;
+
+  addWebSocket(WebSocketChannel webSocket) {
+    assert(sockets[webSocket] == null);
+    final peer = Peer(webSocket.cast<String>(), strictProtocolChecks: false);
+    sockets[webSocket] = peer;
+    registerMethods(peer);
+    if (isListening) {
+      peer.listen();
+    }
+  }
+
+  removeWebSocket(WebSocketChannel webSocket) {
+    final peer = sockets[webSocket];
+    peer.close();
+    sockets[webSocket] = null;
+  }
+
+  Future run() async {
+    //  assert(port != null && webSocket != null);
+    try {
+      /*   _socket = webSocket ??
+          WebSocketChannel.connect(Uri.parse('ws://127.0.0.1:$port/ws'))
+              .cast<String>(); */
+    } catch (e, s) {
+      stderr.addError(e, s);
+    }
+
+    final channel = StreamChannel<String>(
+      stdin.transform(Utf8Decoder()).transform(LineSplitter()),
+      Stoutsink(),
+    );
+
+    _server = Peer(channel, strictProtocolChecks: false,
+        onUnhandledError: (error, stacktrace) {
+      stdout.write('Error $error');
+    });
+
+    registerMethods(_server);
+  }
+
+  Future listen() async {
+    isListening = true;
+    for (final socket in sockets.entries) {
+      socket.value.listen().then(
+        (value) {
+          removeWebSocket(socket.key);
+        },
+      );
+    }
+    return await _server.listen();
+  }
+
+  Future close() async {
+    for (final peer in sockets.values) {
+      await peer.close();
+    }
+    return _server.close();
+  }
+
+  /*  void registerMethod(String name, Function callback) =>
+      _server.registerMethod(name, callback); */
+
+  void sendNotification(String method, [dynamic parameters]) {
+    _server.sendNotification(method, parameters);
+    sockets.values.forEach((e) {
+      e.sendNotification(method, parameters);
+    });
+  }
+
+  registerMethods(Peer server);
+}
diff --git a/flutter-package/bin/old/asset_server.dart b/flutter-package/bin/old/asset_server.dart
new file mode 100644
index 0000000..5cf8c9b
--- /dev/null
+++ b/flutter-package/bin/old/asset_server.dart
@@ -0,0 +1,56 @@
+import 'dart:io';
+import 'package:path/path.dart' as path;
+
+final localAddress = InternetAddress('127.0.0.1');
+
+class AssetServer {
+  HttpServer _server;
+
+  Future<bool> runServer(int port) async {
+    try {
+      _server = await HttpServer.bind(localAddress, port);
+      return true;
+    } catch (e, s) {
+      stderr.addError(e, s);
+      return false;
+    }
+  }
+
+  Future<void> listen() async {
+    await for (final request in _server) {
+      try {
+        if (request.uri.path.startsWith('/asset/')) {
+          final File file =
+              new File(request.uri.path.replaceFirst('/asset/', ''));
+
+          if (file.existsSync()) {
+            final raw = await file.readAsBytes();
+
+            request.response.headers
+                .set('Content-Type', 'image/${path.extension(file.path)}');
+            request.response.headers.set('Content-Length', raw.length);
+            request.response.add(raw);
+            await request.response.close();
+          } else {
+            request.response.statusCode = HttpStatus.notFound;
+            request.response.write('Not found');
+            await request.response.close();
+          }
+        } else {
+          request.response.statusCode = HttpStatus.notFound;
+          request.response.write('Not found');
+          await request.response.close();
+        }
+      } catch (e, s) {
+        stderr.addError(e, s);
+        request.response.statusCode = HttpStatus.internalServerError;
+        request.response.write('Internal Error');
+        await request.response.close();
+      }
+    }
+  }
+
+  Future<void> close() async {
+    await _server.close();
+  }
+}
diff --git a/flutter-package/bin/old/daemon_service.dart b/flutter-package/bin/old/daemon_service.dart
new file mode 100644
index 0000000..7cf923a
--- /dev/null
+++ b/flutter-package/bin/old/daemon_service.dart
@@ -0,0 +1,188 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:async/async.dart';
+import 'package:json_rpc_2/json_rpc_2.dart';
+import 'package:stream_channel/stream_channel.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+import '../preview.dart';
+
+class Stoutsink extends StreamSink<String> {
+  @override
+  void add(String event) {
+    stdout.writeln(event);
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    stdout.addError(error, stackTrace);
+  }
+
+  @override
+  Future addStream(Stream<String> stream) {
+    return stdout.addStream(stream.transform(Utf8Encoder()));
+  }
+
+  @override
+  Future close() {
+    return stdout.close();
+  }
+
+  @override
+  Future get done => stdout.close();
+}
+
+class MultipleSink<T> extends StreamSink<T> {
+  final Iterable<StreamSink<T>> _sinks;
+
+  MultipleSink([this._sinks = const []]);
+
+  @override
+  void add(T event) {
+    _sinks.forEach((sink) => sink.add(event));
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    _sinks.forEach((sink) => sink.addError(error, stackTrace));
+  }
+
+  @override
+  Future addStream(Stream<T> stream) async {
+    for (final sink in _sinks) {
+      await sink.addStream(stream);
+    }
+  }
+
+  @override
+  Future close() async {
+    for (final sink in _sinks) {
+      await sink.close();
+    }
+  }
+
+  @override
+  Future get done => Future.wait(_sinks.map((e) => e.done));
+}
+
+class DaemonService extends MultiplePeer {
+  final int port;
+  DaemonService(this.port);
+
+  @override
+  registerMethods(Peer server) {
+    server.registerMethod('preview.getPort', () {
+      return port;
+    });
+
+    server.registerMethod('preview.setActiveFile', (Parameters params) {
+      final path = params['path'].asString;
+      changeActiveFile(path);
+      return true;
+    });
+
+    server.registerMethod('preview.restart', (Parameters params) {
+      _server.sendNotification('preview.restart');
+      return true;
+    });
+  }
+}
+
+abstract class MultiplePeer {
+  Peer _server;
+  Map<WebSocketChannel, Peer> sockets = {};
+
+  //StreamChannel<String> _socket;
+
+  bool isListening = false;
+
+  addWebSocket(WebSocketChannel webSocket) {
+    assert(sockets[webSocket] == null);
+    final peer = Peer(webSocket.cast<String>(), strictProtocolChecks: false);
+    sockets[webSocket] = peer;
+    registerMethods(peer);
+    if (isListening) {
+      peer.listen();
+    }
+  }
+
+  removeWebSocket(WebSocketChannel webSocket) {
+    final peer = sockets[webSocket];
+    peer.close();
+    sockets[webSocket] = null;
+  }
+
+  Future run() async {
+    //  assert(port != null && webSocket != null);
+    try {
+      /*   _socket = webSocket ??
+          WebSocketChannel.connect(Uri.parse('ws://127.0.0.1:$port/ws'))
+              .cast<String>(); */
+    } catch (e, s) {
+      stderr.addError(e, s);
+    }
+
+    final stream = StreamGroup.merge<String>([
+      //   _socket.stream,
+      stdin.transform(Utf8Decoder()).transform(LineSplitter())
+    ]);
+
+    final channel = StreamChannel<String>(
+      stream,
+      MultipleSink([
+        //    _socket.sink,
+        Stoutsink(),
+      ]),
+    );
+
+    _server = Peer(channel, strictProtocolChecks: false,
+        onUnhandledError: (error, stacktrace) {
+      stdout.write('Error $error');
+    });
+
+    // Any string may be used as a method name. JSON-RPC 2.0 methods are
+    // case-sensitive.
+    var i = 0;
+    _server.registerMethod('count', () {
+      // Just return the value to be sent as a response to the client. This can
+      // be anything JSON-serializable, or a Future that completes to something
+      // JSON-serializable.
+      return i++;
+    });
+
+    registerMethods(_server);
+  }
+
+  Future listen() async {
+    isListening = true;
+    for (final socket in sockets.entries) {
+      socket.value.listen().then(
+        (value) {
+          removeWebSocket(socket.key);
+        },
+      );
+    }
+    return await _server.listen();
+  }
+
+  Future close() async {
+    for (final peer in sockets.values) {
+      await peer.close();
+    }
+    return _server.close();
+  }
+
+  /*  void registerMethod(String name, Function callback) =>
+      _server.registerMethod(name, callback); */
+
+  void sendNotification(String method, [dynamic parameters]) {
+    _server.sendNotification(method, parameters);
+    sockets.values.forEach((e) {
+      e.sendNotification(method, parameters);
+    });
+  }
+
+  registerMethods(Peer server);
+}
diff --git a/flutter-package/bin/hot_restart_server.dart b/flutter-package/bin/old/hot_restart_server.dart
similarity index 100%
rename from flutter-package/bin/hot_restart_server.dart
rename to flutter-package/bin/old/hot_restart_server.dart
diff --git a/flutter-package/bin/old/preview_daemon.dart b/flutter-package/bin/old/preview_daemon.dart
new file mode 100644
index 0000000..20db5e0
--- /dev/null
+++ b/flutter-package/bin/old/preview_daemon.dart
@@ -0,0 +1,234 @@
+import 'dart:convert';
+import 'package:path/path.dart' as path;
+
+import 'dart:io';
+
+import 'package:async/async.dart';
+
+import '../utils.dart';
+import 'run.dart';
+
+class PreviewDaemonService {
+  Stream<PreviewRequest> _requests;
+  HttpServer _server;
+
+  Future<void> start() async {
+    final stinStream = getStindRequests();
+    final succedd = await runServer();
+    Stream<PreviewRequest> requests;
+    if (succedd) {
+      requests = _server.map((event) => PreviewRequest(request: event));
+    }
+
+    _requests = StreamGroup.merge([
+      stinStream,
+      if (requests != null) requests,
+    ]);
+  }
+
+  Stream<PreviewRequest> getStindRequests() {
+    return stdin
+        .transform(Utf8Decoder())
+        .transform(LineSplitter())
+        .map((event) => StdinRequest(event));
+  }
+
+  Future<bool> runServer() async {
+    try {
+      final address = InternetAddress('127.0.0.1');
+      final port = await getUnusedPort(address);
+      print('Preview running on http://127.0.0.1:$port');
+      _server = await HttpServer.bind(address, port);
+      return true;
+    } catch (e) {
+      stdout.write('error');
+      stdout.write(e);
+      return false;
+    }
+  }
+
+  Future<void> listen() async {
+    await for (final request in _requests) {
+      final methods = request.parse();
+      for (final method in methods) {
+        try {
+          switch (method.name) {
+            case 'preview.changeActiveFile':
+              handleOnActiveFileChanged(method, request);
+              break;
+            default:
+              stdout.write(
+                  '[{"event": "preview.error", "result": {"message": "Method $method not found"}}]\n');
+          }
+        } catch (e) {
+          stdout.write(
+              '[{"event": "preview.error", "result": {"message": "Invalid request: $e"}}]\n');
+        }
+      }
+
+      request.when(
+        stdin: (file) {
+          try {
+            if (File(file).existsSync()) {
+              generatePreview(file);
+              //request.response.write('Hello, world');
+            }
+          } catch (e) {
+            stdout.write('error');
+            stdout.write(e);
+            print(e);
+          }
+        },
+        request: (request) async {
+          if (request.uri.path.startsWith('/asset/')) {
+            final File file =
+                new File(request.uri.path.replaceFirst('/asset/', ''));
+
+            if (file.existsSync()) {
+              final raw = await file.readAsBytes();
+
+              request.response.headers
+                  .set('Content-Type', 'image/${path.extension(file.path)}');
+              request.response.headers.set('Content-Length', raw.length);
+              request.response.add(raw);
+              request.response.close();
+            } else {
+              request.response.statusCode = HttpStatus.notFound;
+              request.response.write('Not found');
+            }
+            await request.response.close();
+            return;
+          }
+
+          final hotRestart =
+              request.uri.queryParameters['hotrestart'] == 'true';
+
+          if (hotRestart) {
+            stdout.write('Needs restart\n');
+            request.response.write('Needs restart\n');
+          } else {
+            request.response.write('No param found\n');
+          }
+          await request.response.close();
+        },
+      );
+    }
+  }
+
+  Future<void> close() async {
+    await _server.close();
+  }
+
+  void handleOnActiveFileChanged(
+    DaemonMethod method,
+    PreviewRequest request,
+  ) {
+    final path = method.params['path'];
+    try {
+      if (File(path).existsSync()) {
+        generatePreview(path);
+        //request.response.write('Hello, world');
+      } else {
+        request.sendResponse(
+          '[{"event": "preview.error", "result": {"message: "File not found for path $path"}}]',
+        );
+      }
+    } catch (e) {
+      request.sendResponse(
+        '[{"event": "preview.error", "result": {"message: "Error while generating preview $e"}}]',
+      );
+    }
+  }
+  // [{"method": "preview.changeActiveFile", "params": { "path": "lib/preview.dart"}}]
+}
+
+class PreviewRequest {
+  final String stdin;
+  final HttpRequest request;
+
+  PreviewRequest({
+    this.stdin,
+    this.request,
+  });
+
+  when({
+    Function(String stdin) stdin,
+    Function(HttpRequest request) request,
+  }) {
+    if (this.stdin != null) stdin?.call(this.stdin);
+    if (this.request != null) request?.call(this.request);
+  }
+
+  String getRequest() {
+    return '';
+  }
+
+  void sendResponse(String response) {}
+
+  List<DaemonMethod> parse() {
+    final request = getRequest();
+    try {
+      final json = jsonDecode(request);
+      print(json);
+
+      return List.from(json).map(
+        (e) {
+          try {
+            return DaemonMethod.fromJson(
+              Map<String, dynamic>.from(e),
+            );
+          } catch (e) {
+            throw 'Invalid parsing';
+          }
+        },
+      ).toList();
+    } catch (e) {
+      stdout
+          .write('[{"event": "preview.error", "result": {"message: "$e"}}]\n');
+    }
+
+    return [];
+  }
+}
+
+class StdinRequest extends PreviewRequest {
+  final String _request;
+
+  StdinRequest(this._request);
+
+  String getRequest() => _request;
+
+  void sendResponse(String response) {
+    stdout.write(response);
+  }
+}
+
+class DaemonMethod {
+  final String id;
+  final String name;
+  final Map<String, dynamic> params;
+
+  DaemonMethod({this.id, this.name, this.params});
+
+  factory DaemonMethod.fromJson(Map<String, dynamic> json) {
+    final id = json['id'];
+    final method = json['method'];
+    final params =
+        json['params'] != null ? Map<String, dynamic>.from(json['params']) : {};
+    return DaemonMethod(id: id, name: method, params: params);
+  }
+}
+/* 
+
+class DaemonResponse {
+  final String id;
+  final List<Map<String, dynamic> response;
+  final Map<String, dynamic> args;
+}
+
+
+class DaemonEvent {
+  final String id;
+  final String name;
+  final Map<String, dynamic> args;
+} */
diff --git a/flutter-package/bin/old/run.dart b/flutter-package/bin/old/run.dart
new file mode 100644
index 0000000..cfcf6eb
--- /dev/null
+++ b/flutter-package/bin/old/run.dart
@@ -0,0 +1,111 @@
+import 'dart:async';
+
+import 'dart:io';
+
+import 'package:analyzer/dart/analysis/features.dart';
+import 'package:analyzer/dart/analysis/utilities.dart';
+import 'package:analyzer/dart/ast/ast.dart';
+
+import 'package:analyzer/dart/ast/visitor.dart';
+
+
+import 'preview_daemon.dart';
+import '../templates.dart';
+
+final featureSet = FeatureSet.fromEnableFlags([
+  'extension-methods',
+  //'non-nullable',
+]);
+
+Future<void> main() async {
+  final daemon = PreviewDaemonService();
+  await daemon.start();
+  ProcessSignal.sigint.watch().listen((_) async {
+    print('onClose');
+    await daemon.close();
+    exit(0);
+  });
+  await daemon.listen();
+}
+
+class StreamResponse {
+  final String stdin;
+  final HttpRequest request;
+
+  StreamResponse({
+    this.stdin,
+    this.request,
+  });
+
+  when({Function(String stdin) stdin, Function(HttpRequest request) request}) {
+    if (this.stdin != null) stdin?.call(this.stdin);
+    if (this.request != null) request?.call(this.request);
+  }
+}
+
+void generatePreview(String filePath) {
+  if (filePath == 'lib/main.preview.dart') {
+    File('lib/main.preview.dart').writeAsStringSync(notSeeTemplate);
+    stdout.write('Needs reload\n');
+    return;
+  }
+  if (!filePath.startsWith('lib/')) {
+    File('lib/main.preview.dart').writeAsStringSync(notInLibFormatTemplate);
+    stdout.write('Needs reload\n');
+    return;
+  }
+  if (!filePath.endsWith('.dart')) {
+    File('lib/main.preview.dart').writeAsStringSync(notValidFormatTemplate);
+    stdout.write('Needs reload\n');
+    return;
+  }
+  final fileContent = File(filePath).readAsStringSync();
+
+  final parseResult = parseString(
+    content: fileContent,
+    featureSet: featureSet,
+    path: filePath,
+    throwIfDiagnostics: false,
+  );
+  final providers = <String>[];
+  final unit = parseResult.unit;
+
+  final v = ExtractPreviewsVisitor(providers);
+  unit.visitChildren(v);
+  File('lib/main.preview.dart')
+      .writeAsStringSync(generateFile(filePath, providers));
+  stdout.write('Needs reload\n');
+}
+
+class ExtractPreviewsVisitor extends RecursiveAstVisitor {
+  final List<String> providers;
+
+  ExtractPreviewsVisitor(this.providers);
+
+  @override
+  visitClassDeclaration(ClassDeclaration node) {
+    final supportedExtended = 'PreviewProvider';
+    final supportedMixin = 'Previewer';
+
+    bool isExtended() {
+      final extendedClass = node.extendsClause?.superclass?.toString();
+      return supportedExtended == extendedClass;
+    }
+
+    bool isInMixin() {
+      final item = node.withClause?.mixinTypes?.firstWhere(
+        (c) {
+          return supportedMixin == c.toString();
+        },
+        orElse: () => null,
+      );
+      return item != null;
+    }
+
+    if (isExtended() || isInMixin()) {
+      providers.add(node.name.toString());
+    }
+
+    return super.visitClassDeclaration(node);
+  }
+}
diff --git a/flutter-package/bin/serve.dart b/flutter-package/bin/old/serve.dart
similarity index 100%
rename from flutter-package/bin/serve.dart
rename to flutter-package/bin/old/serve.dart
diff --git a/flutter-package/lib/src/vm/vm_hot_reload.dart b/flutter-package/bin/old/vm_hot_reload.dart
similarity index 100%
rename from flutter-package/lib/src/vm/vm_hot_reload.dart
rename to flutter-package/bin/old/vm_hot_reload.dart
diff --git a/flutter-package/bin/preview.dart b/flutter-package/bin/preview.dart
new file mode 100644
index 0000000..4258f7c
--- /dev/null
+++ b/flutter-package/bin/preview.dart
@@ -0,0 +1,168 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:analyzer/dart/analysis/utilities.dart';
+import 'package:shelf_static/shelf_static.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+import 'daemon_service.dart';
+
+import 'old/run.dart';
+import 'templates.dart';
+import 'utils.dart';
+
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:shelf/shelf_io.dart' as io;
+import 'package:shelf_router/shelf_router.dart' as route;
+import 'package:shelf_web_socket/shelf_web_socket.dart' as ws;
+
+import 'package:http_server/http_server.dart';
+import 'package:mime/mime.dart';
+
+class Server {
+  HttpServer _server;
+
+  Server(this.port);
+
+  Future serve(Function(WebSocketChannel) websocketHandler) async {
+    final router = route.Router()
+      ..get('/ws', ws.webSocketHandler(websocketHandler))
+      ..post('/screenshot', (shelf.Request request) async {
+        final contentType = ContentType.parse(request.headers["content-type"]);
+        final transformer =
+            MimeMultipartTransformer(contentType.parameters['boundary']);
+
+        final bodyStream = request.read();
+        final parts = await transformer.bind(bodyStream).toList();
+        var params;
+        for (var part in parts) {
+          HttpMultipartFormData multipart = HttpMultipartFormData.parse(part);
+
+          //final ContentType contentType = multipart.contentType;
+          final contentDisposition = multipart.contentDisposition;
+          final filename = contentDisposition.parameters['filename'];
+
+          final content = multipart.cast<List<int>>();
+
+          final filePath = "preview/screenshots/" + filename;
+
+          if (!await Directory('preview').exists()) {
+            await Directory('preview').create();
+          }
+
+          if (!await Directory('preview/screenshots').exists()) {
+            await Directory('preview/screenshots').create();
+          }
+
+          IOSink sink = File(filePath).openWrite();
+          await for (List<int> item in content) {
+            sink.add(item);
+          }
+          await sink.flush();
+          await sink.close();
+        }
+
+        return shelf.Response.ok(params.toString());
+      });
+
+    final shelf.Handler staticHandler = (shelf.Request request) {
+      final urlPath = request.url.path;
+      final isGet = request.method == 'GET';
+      final isAsset = urlPath.startsWith('asset/');
+
+      if (isGet && isAsset) {
+        final path = urlPath.replaceFirst('asset/', '');
+        return createFileHandler(path, url: urlPath)(request);
+      } else {
+        return shelf.Response.notFound('');
+      }
+    };
+
+    shelf.Handler safeNotFoundHandler(shelf.Handler handler) {
+      return (shelf.Request request) async {
+        var resp = await handler(request);
+        return Future.value(resp == null ? shelf.Response.notFound('') : resp);
+      };
+    }
+
+    final cascade =
+        shelf.Cascade().add(staticHandler).add(router.handler).handler;
+
+    var handler = const shelf.Pipeline()
+        .addMiddleware(shelf.logRequests())
+        .addHandler(safeNotFoundHandler(cascade));
+
+    _server = await io.serve(handler, '127.0.0.1', port);
+
+    _server.defaultResponseHeaders.remove('x-frame-options', 'SAMEORIGIN');
+  }
+
+  final int port;
+  InternetAddress get address => _server?.address;
+
+  Future close() {
+    return _server.close();
+  }
+}
+
+void main() async {
+  final localAddress = InternetAddress('127.0.0.1');
+  final port = await getUnusedPort(localAddress);
+  final daemonService = DaemonService(port);
+
+  final server = Server(port);
+  await server.serve((webSocket) {
+    daemonService.addWebSocket(webSocket);
+  });
+
+  print('Preview running on http://${server.address.host}:${server.port}');
+
+  await daemonService.run();
+
+  ProcessSignal.sigint.watch().listen((_) async {
+    print('onClose');
+    await server.close();
+    await daemonService.close();
+    exit(0);
+  });
+
+  daemonService.listen();
+  daemonService.sendNotification('preview.launch', {'port': port});
+}
+
+String activeFilePath;
+
+void changeActiveFile(String _activeFilePath) {
+  activeFilePath = _activeFilePath;
+  generatePreview(activeFilePath);
+}
+
+void generatePreview(String filePath) {
+  if (filePath == 'lib/main.preview.dart') {
+    File('lib/main.preview.dart').writeAsStringSync(notSeeTemplate);
+    return;
+  }
+  if (!filePath.startsWith('lib/')) {
+    File('lib/main.preview.dart').writeAsStringSync(notInLibFormatTemplate);
+    return;
+  }
+  if (!filePath.endsWith('.dart')) {
+    File('lib/main.preview.dart').writeAsStringSync(notValidFormatTemplate);
+    return;
+  }
+  final fileContent = File(filePath).readAsStringSync();
+
+  final parseResult = parseString(
+    content: fileContent,
+    featureSet: featureSet,
+    path: filePath,
+    throwIfDiagnostics: false,
+  );
+  final providers = <String>[];
+  final unit = parseResult.unit;
+
+  final v = ExtractPreviewsVisitor(providers);
+  unit.visitChildren(v);
+  File('lib/main.preview.dart')
+      .writeAsStringSync(generateFile(filePath, providers));
+}
diff --git a/flutter-package/bin/run.dart b/flutter-package/bin/run.dart
deleted file mode 100644
index bcb6416..0000000
--- a/flutter-package/bin/run.dart
+++ /dev/null
@@ -1,276 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/analysis/utilities.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-
-import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:async/async.dart';
-
-import 'package:path/path.dart' as path;
-
-final featureSet = FeatureSet.fromEnableFlags([
-  'extension-methods',
-  //'non-nullable',
-]);
-
-final port = 8084;
-
-Future<void> main() async {
-  Stream<StreamResponse> cmdLine = stdin
-      .transform(Utf8Decoder())
-      .transform(LineSplitter())
-      .map((event) => StreamResponse(stdin: event));
-  Stream<StreamResponse> requests;
-  try {
-    final server = await HttpServer.bind('127.0.0.1', port);
-    requests = server.map((event) => StreamResponse(request: event));
-
-    ProcessSignal.sigint.watch().listen((_) async {
-      print('onClose');
-      await server.close();
-    });
-  } catch (e) {
-    stdout.write('error');
-    stdout.write(e);
-  }
-
-  final group = StreamGroup.merge([cmdLine, if (requests != null) requests]);
-
-  await for (final response in group) {
-    response.when(
-      stdin: (file) {
-        try {
-          if (File(file).existsSync()) {
-            generatePreview(file);
-            //request.response.write('Hello, world');
-          }
-        } catch (e) {
-          stdout.write('error');
-          stdout.write(e);
-          print(e);
-        }
-      },
-      request: (request) async {
-        if (request.uri.path.startsWith('/asset/')) {
-          final File file =
-              new File(request.uri.path.replaceFirst('/asset/', ''));
-
-          if (file.existsSync()) {
-            final raw = await file.readAsBytes();
-
-            request.response.headers
-                .set('Content-Type', 'image/${path.extension(file.path)}');
-            request.response.headers.set('Content-Length', raw.length);
-            request.response.add(raw);
-            request.response.close();
-          } else {
-            request.response.statusCode = HttpStatus.notFound;
-            request.response.write('Not found');
-          }
-          await request.response.close();
-          return;
-        }
-
-        final hotRestart = request.uri.queryParameters['hotrestart'] == 'true';
-
-        if (hotRestart) {
-          stdout.write('Needs restart\n');
-          request.response.write('Needs restart\n');
-        } else {
-          request.response.write('No param found\n');
-        }
-        await request.response.close();
-      },
-    );
-  }
-}
-
-class StreamResponse {
-  final String stdin;
-  final HttpRequest request;
-
-  StreamResponse({
-    this.stdin,
-    this.request,
-  });
-
-  when({Function(String stdin) stdin, Function(HttpRequest request) request}) {
-    if (this.stdin != null) stdin?.call(this.stdin);
-    if (this.request != null) request?.call(this.request);
-  }
-}
-
-void generatePreview(String filePath) {
-  if (filePath == 'lib/main.preview.dart') {
-    File('lib/main.preview.dart').writeAsStringSync(notSeeTemplate);
-    stdout.write('Needs reload\n');
-    return;
-  }
-  if (!filePath.startsWith('lib/')) {
-    File('lib/main.preview.dart').writeAsStringSync(notInLibFormatTemplate);
-    stdout.write('Needs reload\n');
-    return;
-  }
-  if (!filePath.endsWith('.dart')) {
-    File('lib/main.preview.dart').writeAsStringSync(notValidFormatTemplate);
-    stdout.write('Needs reload\n');
-    return;
-  }
-  final fileContent = File(filePath).readAsStringSync();
-
-  final parseResult = parseString(
-    content: fileContent,
-    featureSet: featureSet,
-    path: filePath,
-    throwIfDiagnostics: false,
-  );
-  final providers = <String>[];
-  final unit = parseResult.unit;
-
-  final v = ExtractPreviewsVisitor(providers);
-  unit.visitChildren(v);
-  File('lib/main.preview.dart')
-      .writeAsStringSync(generateFile(filePath, providers));
-  stdout.write('Needs reload\n');
-}
-
-class ExtractPreviewsVisitor extends RecursiveAstVisitor {
-  final List<String> providers;
-
-  ExtractPreviewsVisitor(this.providers);
-
-  @override
-  visitClassDeclaration(ClassDeclaration node) {
-    final supportedExtended = 'PreviewProvider';
-    final supportedMixin = 'Previewer';
-
-    bool isExtended() {
-      final extendedClass = node.extendsClause?.superclass?.toString();
-      return supportedExtended == extendedClass;
-    }
-
-    bool isInMixin() {
-      final item = node.withClause?.mixinTypes?.firstWhere(
-        (c) {
-          return supportedMixin == c.toString();
-        },
-        orElse: () => null,
-      );
-      return item != null;
-    }
-
-    if (isExtended() || isInMixin()) {
-      providers.add(node.name.toString());
-    }
-
-    return super.visitClassDeclaration(node);
-  }
-}
-
-String generateFile(String filePath, List<String> providers) {
-  final import = filePath.replaceFirst('/lib/', '').replaceFirst('lib/', '');
-  return '''
-
-import 'package:flutter/widgets.dart';
-import 'package:preview/preview.dart';
-import '$import';  
-void main() {
-  runApp(_PreviewApp());
-}
-
-class _PreviewApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return PreviewPage(
-      path: '$import',
-      providers: () => [
-        ${providers.reversed.fold('', (p, e) => e + '(), \n        ' + p)}
-      ],
-    );
-  }
-}
-  ''';
-}
-
-const String notSeeTemplate = '''
-
-import 'package:flutter/widgets.dart';
-import 'package:preview/preview.dart';
-
-//
-//  
-//                            .............       
-//                          ************          
-//                       .************            
-//                     ************               
-//                  .************                 
-//                ************                    
-//             .************                      
-//           ************                         
-//         ************      ************         
-//           *******      ,************           
-//             .**      ////********              
-//                   *////////****                
-//                  ,//////////%%                 
-//                     //////%%%%%%               
-//                       ,%%%%%%%%%%%%            
-//                          %%%%%%%%%%%%  
-//
-//
-//
-//
-
-void main() {
-  runApp(_PreviewApp());
-}
-
-class _PreviewApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return PreviewPage(
-      child: Text('You should not be editing this file 👀')
-    );
-  }
-}
-  ''';
-
-const String notValidFormatTemplate = '''
-
-import 'package:flutter/widgets.dart';
-import 'package:preview/preview.dart';
-
-void main() {
-  runApp(_PreviewApp());
-}
-
-class _PreviewApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return PreviewPage(
-      child: Text('This format does not support preview 👀')
-      );
-  }
-}
-  ''';
-
-const String notInLibFormatTemplate = '''
-
-import 'package:flutter/widgets.dart';
-import 'package:preview/preview.dart';
-
-void main() {
-  runApp(_PreviewApp());
-}
-
-class _PreviewApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return PreviewPage(
-      child: Text('Select a file from /lib folder to see the preview 👀'),
-    );
-  }
-}
-  ''';
diff --git a/flutter-package/bin/templates.dart b/flutter-package/bin/templates.dart
new file mode 100644
index 0000000..05f9bcf
--- /dev/null
+++ b/flutter-package/bin/templates.dart
@@ -0,0 +1,107 @@
+String generateFile(
+  String filePath,
+  List<String> providers,
+) {
+  final import = filePath.replaceFirst('/lib/', '').replaceFirst('lib/', '');
+  return '''
+
+import 'package:flutter/widgets.dart';
+import 'package:preview/preview.dart';
+import '$import';  
+void main() {
+  runApp(_PreviewApp());
+}
+
+class _PreviewApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PreviewPage(
+      path: '$import',
+      providers: () => [
+        ${providers.reversed.fold('', (p, e) => e + '(), \n        ' + p)}
+      ],
+    );
+  }
+}
+  ''';
+}
+
+const String notSeeTemplate = '''
+
+import 'package:flutter/widgets.dart';
+import 'package:preview/preview.dart';
+
+//
+//  
+//                            .............       
+//                          ************          
+//                       .************            
+//                     ************               
+//                  .************                 
+//                ************                    
+//             .************                      
+//           ************                         
+//         ************      ************         
+//           *******      ,************           
+//             .**      ////********              
+//                   *////////****                
+//                  ,//////////%%                 
+//                     //////%%%%%%               
+//                       ,%%%%%%%%%%%%            
+//                          %%%%%%%%%%%%  
+//
+//
+//
+//
+
+void main() {
+  runApp(_PreviewApp());
+}
+
+class _PreviewApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PreviewPage(
+      child: Text('You should not be editing this file 👀')
+    );
+  }
+}
+  ''';
+
+const String notValidFormatTemplate = '''
+
+import 'package:flutter/widgets.dart';
+import 'package:preview/preview.dart';
+
+void main() {
+  runApp(_PreviewApp());
+}
+
+class _PreviewApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PreviewPage(
+      child: Text('This format does not support preview 👀')
+      );
+  }
+}
+  ''';
+
+const String notInLibFormatTemplate = '''
+
+import 'package:flutter/widgets.dart';
+import 'package:preview/preview.dart';
+
+void main() {
+  runApp(_PreviewApp());
+}
+
+class _PreviewApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PreviewPage(
+      child: Text('Select a file from /lib folder to see the preview 👀'),
+    );
+  }
+}
+  ''';
diff --git a/flutter-package/bin/utils.dart b/flutter-package/bin/utils.dart
new file mode 100644
index 0000000..7f362af
--- /dev/null
+++ b/flutter-package/bin/utils.dart
@@ -0,0 +1,10 @@
+import 'dart:io';
+
+Future<int> getUnusedPort(InternetAddress address) {
+  return ServerSocket.bind(address ?? InternetAddress.anyIPv4, 0)
+      .then((socket) {
+    var port = socket.port;
+    socket.close();
+    return port;
+  });
+}
diff --git a/flutter-package/example/android/app/src/main/AndroidManifest.xml b/flutter-package/example/android/app/src/main/AndroidManifest.xml
index 99ed3c3..c627ab0 100644
--- a/flutter-package/example/android/app/src/main/AndroidManifest.xml
+++ b/flutter-package/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.preview_example">
+
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/flutter-package/example/ios/Podfile.lock b/flutter-package/example/ios/Podfile.lock
index 6b0d2a7..b19e916 100644
--- a/flutter-package/example/ios/Podfile.lock
+++ b/flutter-package/example/ios/Podfile.lock
@@ -1,7 +1,11 @@
 PODS:
   - Flutter (1.0.0)
+  - path_provider_linux (0.0.1):
+    - Flutter
   - shared_preferences (0.0.1):
     - Flutter
+  - shared_preferences_linux (0.0.1):
+    - Flutter
   - shared_preferences_macos (0.0.1):
     - Flutter
   - shared_preferences_web (0.0.1):
@@ -9,15 +13,21 @@ PODS:
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
+  - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
   - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
   - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
+  path_provider_linux:
+    :path: ".symlinks/plugins/path_provider_linux/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
+  shared_preferences_linux:
+    :path: ".symlinks/plugins/shared_preferences_linux/ios"
   shared_preferences_macos:
     :path: ".symlinks/plugins/shared_preferences_macos/ios"
   shared_preferences_web:
@@ -25,7 +35,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
+  shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
   shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
   shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
 
diff --git a/flutter-package/example/lib/main.dart b/flutter-package/example/lib/main.dart
index d0bd69a..cfc4aab 100644
--- a/flutter-package/example/lib/main.dart
+++ b/flutter-package/example/lib/main.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:preview/preview.dart';
@@ -58,7 +56,7 @@ class MyHomePage extends StatefulWidget {
 
 class _MyHomePageState extends State<MyHomePage> {
   int _counter = 0;
-  
+
   void _incrementCounter() {
     setState(() {
       // This call to setState tells the Flutter framework that something has
diff --git a/flutter-package/example/lib/main.preview.dart b/flutter-package/example/lib/main.preview.dart
index cc9e77b..f842f09 100644
--- a/flutter-package/example/lib/main.preview.dart
+++ b/flutter-package/example/lib/main.preview.dart
@@ -1,7 +1,7 @@
-
 import 'package:flutter/widgets.dart';
 import 'package:preview/preview.dart';
-import 'main.dart';  
+import 'widgets/card.dart';
+
 void main() {
   runApp(_PreviewApp());
 }
@@ -10,14 +10,12 @@ class _PreviewApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return PreviewPage(
-      path: 'main.dart',
+      path: 'widgets/card.dart',
       providers: () => [
-        IPhoneX(), 
-        IPad(), 
-        AllPreview(), 
-        
+        WidgetPreview(),
+        Resizable(),
+        StaggeredCard(),
       ],
     );
   }
 }
-  
\ No newline at end of file
diff --git a/flutter-package/example/lib/preview.dart b/flutter-package/example/lib/preview.dart
new file mode 100644
index 0000000..5241f43
--- /dev/null
+++ b/flutter-package/example/lib/preview.dart
@@ -0,0 +1,11 @@
+
+
+
+/* class ScreenShotPreview extends StatelessWidget with Previewer {
+  @override
+  Widget build(BuildContext context) {
+    return
+  }
+
+}
+ */
diff --git a/flutter-package/example/lib/widgets/card.dart b/flutter-package/example/lib/widgets/card.dart
index be4b2fc..78c55f2 100644
--- a/flutter-package/example/lib/widgets/card.dart
+++ b/flutter-package/example/lib/widgets/card.dart
@@ -1,9 +1,10 @@
+import 'dart:async';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
-import 'package:preview/preview.dart';
 import 'package:palette_generator/palette_generator.dart';
+import 'package:preview/preview.dart';
 
 class MusicCard extends StatelessWidget {
   final String title;
@@ -22,6 +23,12 @@ class MusicCard extends StatelessWidget {
       : super(key: key);
 
   Future<Color> getImagePalette(ImageProvider imageProvider) async {
+    final ImageStream stream = imageProvider.resolve(ImageConfiguration.empty);
+    final Completer<void> completer = Completer<void>();
+    stream.addListener(ImageStreamListener(
+        (ImageInfo info, bool syncCall) => completer.complete()));
+    await completer.future;
+
     final PaletteGenerator paletteGenerator =
         await PaletteGenerator.fromImageProvider(imageProvider);
     return paletteGenerator.dominantColor.color;
@@ -125,29 +132,29 @@ class WidgetPreview extends PreviewProvider {
         child: MusicCard(
           title: 'Blond',
           singer: 'Frank Ocean',
-          image: PreviewImage.asset('preview_assets/cover1.jpg'),
+          image: PreviewImage.asset('preview/assets/cover1.jpg'),
           onTap: () => {},
         ),
       ),
       Preview(
-        height: 300,
+        height: 200,
         width: 200,
         mode: UpdateMode.hotRestart,
         child: MusicCard(
           title: 'Safe',
           singer: 'Arlo',
-          image: PreviewImage.asset('preview_assets/cover2.jpg'),
+          image: PreviewImage.asset('preview/assets/cover2.jpg'),
           onTap: () => {},
         ),
       ),
       Preview(
-        height: 300,
-        width: 200,
+        height: 200,
+        width: 300,
         mode: UpdateMode.hotReload,
         child: MusicCard(
           title: '1989',
           singer: 'Taylor Swift',
-          image: PreviewImage.asset('preview_assets/cover3.jpg'),
+          image: PreviewImage.asset('preview/assets/cover3.jpg'),
           onTap: () => {},
         ),
       ),
@@ -160,10 +167,12 @@ class Resizable extends ResizablePreviewProvider with Previewer {
   Preview get preview {
     return Preview(
       mode: UpdateMode.hotReload,
+      screenshotSettings:
+          ScreenshotSettings(pixelRatio: 4, filename: 'test.png'),
       child: MusicCard(
         title: 'Blond',
         singer: 'Frank Ocean',
-        image: PreviewImage.asset('preview_assets/cover1.jpg'),
+        image: PreviewImage.asset('preview/assets/cover1.jpg'),
         onTap: () => {},
       ),
     );
@@ -184,9 +193,9 @@ class StaggeredCard extends StatelessWidget with Previewer {
 
   @override
   Widget build(BuildContext context) {
-    final a = AlbumData('Blond', 'Frank Ocean', 'preview_assets/cover1.jpg');
-    final b = AlbumData('Blond', 'Frank Ocean', 'preview_assets/cover2.jpg');
-    final c = AlbumData('Blond', 'Frank Ocean', 'preview_assets/cover3.jpg');
+    final a = AlbumData('Blond', 'Frank Ocean', 'preview/assets/cover1.jpg');
+    final b = AlbumData('Blond', 'Frank Ocean', 'preview/assets/cover2.jpg');
+    final c = AlbumData('Blond', 'Frank Ocean', 'preview/assets/cover3.jpg');
     final list = [a, b, c, b, a, c, b, a, a, a, a, a, a, a];
     return StaggeredGridView.countBuilder(
       padding: EdgeInsets.all(4),
diff --git a/flutter-package/example/preview_assets/cover1.jpg b/flutter-package/example/preview/assets/cover1.jpg
similarity index 100%
rename from flutter-package/example/preview_assets/cover1.jpg
rename to flutter-package/example/preview/assets/cover1.jpg
diff --git a/flutter-package/example/preview_assets/cover2.jpg b/flutter-package/example/preview/assets/cover2.jpg
similarity index 100%
rename from flutter-package/example/preview_assets/cover2.jpg
rename to flutter-package/example/preview/assets/cover2.jpg
diff --git a/flutter-package/example/preview_assets/cover3.jpg b/flutter-package/example/preview/assets/cover3.jpg
similarity index 100%
rename from flutter-package/example/preview_assets/cover3.jpg
rename to flutter-package/example/preview/assets/cover3.jpg
diff --git a/flutter-package/example/preview/screenshots/MusicCard.png b/flutter-package/example/preview/screenshots/MusicCard.png
new file mode 100644
index 0000000..6e92be2
Binary files /dev/null and b/flutter-package/example/preview/screenshots/MusicCard.png differ
diff --git a/flutter-package/example/preview/screenshots/test.png b/flutter-package/example/preview/screenshots/test.png
new file mode 100644
index 0000000..c320f55
Binary files /dev/null and b/flutter-package/example/preview/screenshots/test.png differ
diff --git a/flutter-package/example/pubspec.lock b/flutter-package/example/pubspec.lock
index 8f12f36..67feb05 100644
--- a/flutter-package/example/pubspec.lock
+++ b/flutter-package/example/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.12"
+    version: "0.39.13"
   args:
     dependency: transitive
     description:
@@ -36,6 +36,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   charcode:
     dependency: transitive
     description:
@@ -56,7 +63,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.14.13"
   convert:
     dependency: transitive
     description:
@@ -113,6 +120,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.2.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -183,7 +197,14 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.1"
+    version: "0.12.2"
+  http_methods:
+    dependency: transitive
+    description:
+      name: http_methods
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   http_parser:
     dependency: transitive
     description:
@@ -191,6 +212,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
+  http_server:
+    dependency: transitive
+    description:
+      name: http_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.8+3"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
   js:
     dependency: transitive
     description:
@@ -205,13 +240,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  json_rpc_2:
+    dependency: transitive
+    description:
+      name: json_rpc_2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -219,6 +261,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.6+3"
   node_interop:
     dependency: transitive
     description:
@@ -254,6 +303,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+2"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   pedantic:
     dependency: transitive
     description:
@@ -261,13 +324,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   preview:
     dependency: "direct dev"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.5+2"
+    version: "0.0.8"
+  process:
+    dependency: transitive
+    description:
+      name: process
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.13"
   pub_semver:
     dependency: transitive
     description:
@@ -288,7 +372,14 @@ packages:
       name: shared_preferences
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.5.7+3"
+    version: "0.5.8"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2+1"
   shared_preferences_macos:
     dependency: transitive
     description:
@@ -310,6 +401,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2+7"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.7"
+  shelf_router:
+    dependency: transitive
+    description:
+      name: shelf_router
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.8"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -356,14 +475,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.16"
+    version: "0.2.17"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   vector_math:
     dependency: transitive
     description:
@@ -385,6 +504,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.7+15"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0"
   yaml:
     dependency: transitive
     description:
@@ -393,5 +526,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.7.0 <3.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
   flutter: ">=1.15.21 <2.0.0"
diff --git a/flutter-package/lib/preview.dart b/flutter-package/lib/preview.dart
index 2d5ec6a..1b03517 100644
--- a/flutter-package/lib/preview.dart
+++ b/flutter-package/lib/preview.dart
@@ -1,9 +1,12 @@
+library preview;
+
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:preview/src/controls.dart';
 import 'package:preview/src/frame/frame.dart';
 import 'package:preview/src/resizable.dart';
 import 'package:preview/src/persist.dart';
+import 'package:preview/src/screenshot.dart';
 
 import 'src/utils.dart';
 export 'src/frame/frame.dart';
@@ -11,6 +14,7 @@ export 'src/frame/frames.dart';
 export 'src/preview_page.dart';
 export 'src/resizable.dart';
 export 'src/assets/image.dart';
+export 'src/screenshot.dart';
 
 class Preview extends StatelessWidget {
   final Widget child;
@@ -20,6 +24,7 @@ class Preview extends StatelessWidget {
   final FrameData frame;
   final ThemeData theme;
   final UpdateMode mode;
+  final ScreenshotSettings screenshotSettings;
 
   Preview({
     Key key,
@@ -30,9 +35,12 @@ class Preview extends StatelessWidget {
     this.frame,
     this.theme,
     this.mode = UpdateMode.hotRestart,
+    this.screenshotSettings,
   })  : assert(debugAssertPreviewModeRequired(runtimeType)),
         super(key: key);
 
+  String get name => child.runtimeType.toString();
+
   @override
   Widget build(BuildContext context) {
     Widget result = frame != null ? Frame(frame: frame, child: child) : child;
@@ -70,7 +78,7 @@ abstract class PreviewProvider extends StatelessWidget with Previewer {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: previews
-                .map<Widget>((e) => _Preview(
+                .map<Widget>((Preview e) => _Preview(
                       child: e,
                       updateMode: e.mode,
                     ))
@@ -98,8 +106,9 @@ abstract class ResizablePreviewProvider extends StatelessWidget with Previewer {
 enum UpdateMode { hotReload, hotRestart }
 
 class _Preview extends StatefulWidget {
-  final Widget child;
+  final Preview child;
   final bool resizable;
+
   final UpdateMode updateMode;
 
   const _Preview({
@@ -115,17 +124,33 @@ class _Preview extends StatefulWidget {
 
 class _PreviewState extends State<_Preview> {
   PersistController controller;
+  ScreenshotController screenshotController;
 
   @override
   void initState() {
     controller = PersistController();
+    screenshotController = ScreenshotController();
+    ScreenshotSettings screenshotSettings =
+        widget.child.screenshotSettings ?? ScreenshotSettings();
+
+    if (widget.child.name != null && screenshotSettings.filename == null) {
+      screenshotSettings =
+          screenshotSettings.copyWith(filename: widget.child.name + '.png');
+    }
+    screenshotController.settings = screenshotSettings;
     controller.isHotRestart = widget.updateMode == UpdateMode.hotRestart;
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    final preview = Persist(controller: controller, child: widget.child);
+    final preview = Persist(
+      controller: controller,
+      child: Screenshottable(
+        child: widget.child,
+        controller: screenshotController,
+      ),
+    );
 
     if (widget.resizable) {
       return OnHover(
@@ -141,6 +166,7 @@ class _PreviewState extends State<_Preview> {
                   ignoring: !shouldDisplay,
                   child: PreviewControls(
                     controller: controller,
+                    screenshotController: screenshotController,
                   ),
                 ),
               ),
@@ -167,6 +193,7 @@ class _PreviewState extends State<_Preview> {
                 ignoring: !shouldDisplay,
                 child: PreviewControls(
                   controller: controller,
+                  screenshotController: screenshotController,
                 ),
               ),
             ),
@@ -191,5 +218,3 @@ class _PreviewState extends State<_Preview> {
     super.dispose();
   }
 }
-
-
diff --git a/flutter-package/lib/src/assets/image.dart b/flutter-package/lib/src/assets/image.dart
index 9e57bba..998a189 100644
--- a/flutter-package/lib/src/assets/image.dart
+++ b/flutter-package/lib/src/assets/image.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/rendering.dart';
 import 'package:preview/src/utils.dart';
-
-const PreviewPort = 8084;
+import 'package:preview/src/vm/preview_service.dart';
 
 extension PreviewImage on NetworkImage {
   static NetworkImage asset(String asset, {double scale}) {
     assert(debugAssertPreviewModeRequired('PreviewImage'));
-    return NetworkImage('http://127.0.0.1:$PreviewPort/asset/$asset');
+    assert(debugPreviewPortRequired('PreviewImage'));
+    return NetworkImage('http://$previewAddress:$kPreviewPort/asset/$asset');
   }
 }
diff --git a/flutter-package/lib/src/controls.dart b/flutter-package/lib/src/controls.dart
index 43b06db..eb40774 100644
--- a/flutter-package/lib/src/controls.dart
+++ b/flutter-package/lib/src/controls.dart
@@ -1,13 +1,20 @@
+import 'dart:developer';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:preview/src/persist.dart';
+import 'package:preview/src/screenshot.dart';
 import 'package:preview/src/utils.dart';
+import 'package:preview/src/vm/preview_service.dart';
 
 import 'preview_icons.dart';
 
 class PreviewControls extends StatefulWidget {
   final PersistController controller;
+  final ScreenshotController screenshotController;
 
-  PreviewControls({Key key, this.controller})
+  PreviewControls({Key key, this.controller, this.screenshotController})
       : assert(debugAssertPreviewModeRequired(runtimeType)),
         super(key: key);
   @override
@@ -31,6 +38,39 @@ class _PreviewControlsState extends State<PreviewControls> {
       mainAxisAlignment: MainAxisAlignment.end,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
+        // Scene.toImage is not implemented for web
+        // Screenshot is disable for web until this is implemented
+        // https://github.com/flutter/flutter/issues/42767
+        if (!kIsWeb)
+          AnimatedContainer(
+            height: 20,
+            decoration: BoxDecoration(
+              color: Colors.grey[800],
+              shape: BoxShape.circle,
+            ),
+            duration: Duration(milliseconds: 200),
+            child: IconButton(
+                // splashRadius: 12,
+                tooltip: 'Screenshot',
+                iconSize: 10,
+                padding: EdgeInsets.all(2),
+                icon: Icon(
+                  Icons.photo_camera,
+                  color: Colors.white.withOpacity(0.8),
+                ),
+                onPressed: () async {
+                  final controller = widget.screenshotController;
+                  final image = await controller.takeScreenshot();
+                  print('done');
+                  try {
+                    PreviewService()
+                        .saveScreenshot(image, controller.settings.filename);
+                  } catch (e, s) {
+                    log('fail', error: e, stackTrace: s);
+                  }
+                }),
+          ),
+        SizedBox(height: 8),
         if (!controller.isHotRestart)
           AnimatedContainer(
             height: 20,
@@ -58,16 +98,17 @@ class _PreviewControlsState extends State<PreviewControls> {
               shape: BoxShape.circle),
           duration: Duration(milliseconds: 200),
           child: IconButton(
-            // splashRadius: 12, Not on master yet
-            tooltip: controller.isHotRestart
-                ? 'Disable Auto Hot Restart'
-                : 'Enable Auto Hot Restart',
-            iconSize: 12,
-            padding: EdgeInsets.all(2),
-            icon: Icon(Icons.play_arrow),
-            onPressed: () => setState(
-                () => controller.isHotRestart = !controller.isHotRestart),
-          ),
+              // splashRadius: 12, Not on master yet
+              tooltip: controller.isHotRestart
+                  ? 'Disable Auto Hot Restart'
+                  : 'Enable Auto Hot Restart',
+              iconSize: 12,
+              padding: EdgeInsets.all(2),
+              icon: Icon(Icons.play_arrow),
+              onPressed: () {
+                setState(
+                    () => controller.isHotRestart = !controller.isHotRestart);
+              }),
         )
       ],
     );
diff --git a/flutter-package/lib/src/frame/frame.dart b/flutter-package/lib/src/frame/frame.dart
index 1f8f476..b1053d2 100644
--- a/flutter-package/lib/src/frame/frame.dart
+++ b/flutter-package/lib/src/frame/frame.dart
@@ -5,8 +5,6 @@ export 'package:device_frame/device_frame.dart'
     show DeviceFrameStyle, DeviceNotch, DeviceSideButton;
 import 'frame_painter.dart' as frame_painter;
 
-
-
 const previewAppBuilder = kDebugMode ? Frame._appBuilder : null;
 
 class FrameData {
diff --git a/flutter-package/lib/src/frame/frame_painter.dart b/flutter-package/lib/src/frame/frame_painter.dart
index b2117f0..1a847aa 100644
--- a/flutter-package/lib/src/frame/frame_painter.dart
+++ b/flutter-package/lib/src/frame/frame_painter.dart
@@ -190,7 +190,7 @@ class MobileDeviceFrame extends StatelessWidget {
 
 //
 // Modified to work with web
-// Anything that uses Path.combined is either not executed on web, or 
+// Anything that uses Path.combined is either not executed on web, or
 // replaced with blendMode
 //
 class _DeviceFramePainter extends CustomPainter {
diff --git a/flutter-package/lib/src/preview_page.dart b/flutter-package/lib/src/preview_page.dart
index 8a1fd66..befa0e3 100644
--- a/flutter-package/lib/src/preview_page.dart
+++ b/flutter-package/lib/src/preview_page.dart
@@ -1,10 +1,11 @@
 import 'dart:developer';
-import 'package:http/http.dart' as http;
+import 'package:flutter/services.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:preview/preview.dart';
 import 'package:preview/src/utils.dart';
+import 'package:preview/src/vm/preview_service.dart';
 //import 'package:window_size/window_size.dart';
 
 class PreviewPage extends StatelessWidget {
@@ -25,41 +26,37 @@ class PreviewPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final list = providers?.call() ?? const <Previewer>[];
     print('page_${path}_${list.length}');
+
     return MaterialApp(
       debugShowCheckedModeBanner: false,
       theme: ThemeData.dark(),
-      home: _ProviderPageView(
-        key: Key('page_${path}_${list.length}'),
-        providers: list,
-        child: child,
-        path: path,
+      home: _PreviewServiceHandler(
+        child: _ProviderPageView(
+          key: Key('page_${path}_${list.length}'),
+          providers: list,
+          child: child,
+          path: path,
+        ),
       ),
     );
   }
 }
 
-class _ProviderPageView extends StatefulWidget {
-  final List<Previewer> providers;
+class _PreviewServiceHandler extends StatefulWidget {
   final Widget child;
-  final String path;
-
-  const _ProviderPageView({
-    Key key,
-    this.providers,
-    this.child,
-    this.path,
-  }) : super(key: key);
 
+  const _PreviewServiceHandler({Key key, this.child}) : super(key: key);
   @override
-  _ProviderPageViewState createState() => _ProviderPageViewState();
+  _PreviewServiceHandlerState createState() => _PreviewServiceHandlerState();
 }
 
-class _ProviderPageViewState extends State<_ProviderPageView>
-    with TickerProviderStateMixin {
-  TabController tabController;
-
+class _PreviewServiceHandlerState extends State<_PreviewServiceHandler> {
   @override
   void initState() {
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+        statusBarColor: Colors.transparent,
+        statusBarBrightness: Brightness.dark));
+    PreviewService().start();
     ErrorWidget.builder = (FlutterErrorDetails details) {
       if (details.exceptionAsString() ==
           'Unimplemented handling of missing static target')
@@ -75,7 +72,37 @@ class _ProviderPageViewState extends State<_ProviderPageView>
           message: message,
           error: exception is FlutterError ? exception : null);
     };
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.child;
+  }
+}
+
+class _ProviderPageView extends StatefulWidget {
+  final List<Previewer> providers;
+  final Widget child;
+  final String path;
+
+  const _ProviderPageView({
+    Key key,
+    this.providers,
+    this.child,
+    this.path,
+  }) : super(key: key);
+
+  @override
+  _ProviderPageViewState createState() => _ProviderPageViewState();
+}
+
+class _ProviderPageViewState extends State<_ProviderPageView>
+    with TickerProviderStateMixin {
+  TabController tabController;
 
+  @override
+  void initState() {
     tabController = TabController(
         initialIndex: 0, length: widget.providers.length, vsync: this);
     tabController.addListener(update);
@@ -91,7 +118,6 @@ class _ProviderPageViewState extends State<_ProviderPageView>
 
   @override
   Widget build(BuildContext context) {
-  
     return Scaffold(
       backgroundColor: Colors.grey[900],
       appBar: widget.providers.length <= 1
@@ -100,121 +126,129 @@ class _ProviderPageViewState extends State<_ProviderPageView>
               child: Material(
                 color: Color(0xff2D2D2D),
                 elevation: 6,
-                child: SafeArea(child: Container(height: 36, child:TabBar(
-                  indicator: BoxDecoration(),
-                  indicatorWeight: 0,
-                  labelPadding: EdgeInsets.all(0),
-                  controller: tabController,
-                  indicatorSize: TabBarIndicatorSize.label,
-                  isScrollable: true,
-                  tabs: List.generate(
-                    widget.providers.length,
-                    (index) {
-                      final provider = widget.providers[index];
-                      return Tab(
-                        child: AnimatedContainer(
-                          duration: Duration(milliseconds: 200),
-                          padding: EdgeInsets.symmetric(
-                              horizontal: 12, vertical: 11),
-                          color: tabController.index == index
-                              ? Color(0xff1E1E1E)
-                              : null,
-                          child: Text(
-                              '${provider.title ?? provider.runtimeType.toString()}',
-                              style: TextStyle(fontSize: 12)),
-                        ),
-                      );
-                    },
-                  ).toList(),
-                ),),),
+                child: SafeArea(
+                  child: Container(
+                    height: 36,
+                    child: TabBar(
+                      indicator: BoxDecoration(),
+                      indicatorWeight: 0,
+                      labelPadding: EdgeInsets.all(0),
+                      controller: tabController,
+                      indicatorSize: TabBarIndicatorSize.label,
+                      isScrollable: true,
+                      tabs: List.generate(
+                        widget.providers.length,
+                        (index) {
+                          final provider = widget.providers[index];
+                          return Tab(
+                            child: AnimatedContainer(
+                              duration: Duration(milliseconds: 200),
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: 12, vertical: 11),
+                              color: tabController.index == index
+                                  ? Color(0xff1E1E1E)
+                                  : null,
+                              child: Text(
+                                  '${provider.title ?? provider.runtimeType.toString()}',
+                                  style: TextStyle(fontSize: 12)),
+                            ),
+                          );
+                        },
+                      ).toList(),
+                    ),
+                  ),
+                ),
               ),
               preferredSize: Size(double.infinity, 36),
             ),
       bottomNavigationBar: widget.providers.length <= 1
           ? null
           : Container(
-              
               color: Colors.blue,
-              child: SafeArea(child: Container(
-              height: 22,
-             
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  AnimatedOpacity(
-                    duration: Duration(milliseconds: 300),
-                    opacity: tabController.index == 0 ? 0 : 1,
-                    child: Material(
-                      color: Colors.transparent,
-                      child: InkWell(
-                        child: Center(
-                            child: Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 4),
-                          child: Icon(
-                            Icons.chevron_left,
-                            size: 20,
-                          ),
-                        )),
-                        onTap: tabController.index == 0
-                            ? null
-                            : () => tabController.animateTo(
-                                tabController.index - 1,
-                                duration: Duration(milliseconds: 700),
-                                curve: Curves.easeInOut),
-                      ),
-                    ),
-                  ),
-                  Row(
+              child: SafeArea(
+                child: Container(
+                  height: 22,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
-                      Text(
-                        '${tabController.index + 1}',
-                        style: TextStyle(
-                            fontWeight: FontWeight.bold, fontSize: 13),
-                      ),
-                      Text(
-                        ' / ',
-                        style: TextStyle(color: Colors.white60, fontSize: 13),
+                      AnimatedOpacity(
+                        duration: Duration(milliseconds: 300),
+                        opacity: tabController.index == 0 ? 0 : 1,
+                        child: Material(
+                          color: Colors.transparent,
+                          child: InkWell(
+                            child: Center(
+                                child: Padding(
+                              padding: EdgeInsets.symmetric(horizontal: 4),
+                              child: Icon(
+                                Icons.chevron_left,
+                                size: 20,
+                              ),
+                            )),
+                            onTap: tabController.index == 0
+                                ? null
+                                : () => tabController.animateTo(
+                                    tabController.index - 1,
+                                    duration: Duration(milliseconds: 700),
+                                    curve: Curves.easeInOut),
+                          ),
+                        ),
                       ),
-                      Text(
-                        '${widget.providers.length}',
-                        style: TextStyle(
-                            color: Colors.white60,
-                            fontWeight: FontWeight.w300,
-                            fontSize: 13),
+                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Text(
+                            '${tabController.index + 1}',
+                            style: TextStyle(
+                                fontWeight: FontWeight.bold, fontSize: 13),
+                          ),
+                          Text(
+                            ' / ',
+                            style:
+                                TextStyle(color: Colors.white60, fontSize: 13),
+                          ),
+                          Text(
+                            '${widget.providers.length}',
+                            style: TextStyle(
+                                color: Colors.white60,
+                                fontWeight: FontWeight.w300,
+                                fontSize: 13),
+                          ),
+                        ],
                       ),
-                    ],
-                  ),
-                  AnimatedOpacity(
-                    duration: Duration(milliseconds: 300),
-                    opacity:
-                        tabController.index == (widget.providers.length - 1)
-                            ? 0
-                            : 1,
-                    child: Material(
-                      color: Colors.transparent,
-                      child: InkWell(
-                        child: Center(
-                            child: Padding(
-                          padding: EdgeInsets.symmetric(horizontal: 4),
-                          child: Icon(
-                            Icons.chevron_right,
-                            size: 20,
+                      AnimatedOpacity(
+                        duration: Duration(milliseconds: 300),
+                        opacity:
+                            tabController.index == (widget.providers.length - 1)
+                                ? 0
+                                : 1,
+                        child: Material(
+                          color: Colors.transparent,
+                          child: InkWell(
+                            child: Center(
+                                child: Padding(
+                              padding: EdgeInsets.symmetric(horizontal: 4),
+                              child: Icon(
+                                Icons.chevron_right,
+                                size: 20,
+                              ),
+                            )),
+                            onTap: () =>
+                                tabController.index == tabController.length - 1
+                                    ? null
+                                    : tabController.animateTo(
+                                        tabController.index + 1,
+                                        duration: Duration(milliseconds: 700),
+                                        curve: Curves.easeInOut),
                           ),
-                        )),
-                        onTap: () => tabController.index ==
-                                tabController.length - 1
-                            ? null
-                            : tabController.animateTo(tabController.index + 1,
-                                duration: Duration(milliseconds: 700),
-                                curve: Curves.easeInOut),
+                        ),
                       ),
-                    ),
+                    ],
                   ),
-                ],
+                ),
               ),
-            ),),),
+            ),
       body: widget.child != null
           ? Center(child: widget.child)
           : TabBarView(
@@ -275,7 +309,7 @@ class StaticTargetErrorWidget extends StatelessWidget {
                     postEvent('Preview.hotRestart', <String, String>{});
                   });
                   try {
-                    await http.post('http://127.0.0.1:8084?hotrestart=true');
+                    PreviewService().requestRestart();
                   } catch (e) {
                     print('preview server is not available');
                   }
diff --git a/flutter-package/lib/src/resizable.dart b/flutter-package/lib/src/resizable.dart
index 1ab7b25..200e400 100644
--- a/flutter-package/lib/src/resizable.dart
+++ b/flutter-package/lib/src/resizable.dart
@@ -13,7 +13,7 @@ class ResizableWidget extends StatefulWidget {
   });
 
   final Widget child;
-  
+
   @override
   _ResizableWidgetState createState() => _ResizableWidgetState();
 }
diff --git a/flutter-package/lib/src/screenshot.dart b/flutter-package/lib/src/screenshot.dart
new file mode 100644
index 0000000..60e8b7f
--- /dev/null
+++ b/flutter-package/lib/src/screenshot.dart
@@ -0,0 +1,52 @@
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:flutter/rendering.dart';
+import 'package:flutter/widgets.dart';
+
+class Screenshottable extends StatefulWidget {
+  final Widget child;
+  final ScreenshotController controller;
+
+  const Screenshottable({Key key, this.child, this.controller})
+      : super(key: key);
+  @override
+  _ScreenshottableState createState() => _ScreenshottableState();
+}
+
+class _ScreenshottableState extends State<Screenshottable> {
+  @override
+  Widget build(BuildContext context) {
+    return RepaintBoundary(key: widget.controller._key, child: widget.child);
+  }
+}
+
+class ScreenshotController {
+  final _key = GlobalKey();
+
+  ScreenshotSettings settings = ScreenshotSettings();
+
+  Future<Uint8List> takeScreenshot() async {
+    RenderRepaintBoundary boundary = _key.currentContext.findRenderObject();
+    final image = await boundary.toImage(pixelRatio: settings.pixelRatio);
+    final byteData = await image.toByteData(format: ImageByteFormat.png);
+    final pngBytes = byteData.buffer.asUint8List();
+    return pngBytes;
+  }
+}
+
+class ScreenshotSettings {
+  final double pixelRatio;
+  final String filename;
+
+  ScreenshotSettings({this.filename, double pixelRatio})
+      : assert(filename == null || filename.endsWith('.png'),
+            'Screenshot filename must have the extension .png'),
+        this.pixelRatio = pixelRatio ?? window.devicePixelRatio;
+
+  ScreenshotSettings copyWith({String filename, double pixelRatio}) {
+    return ScreenshotSettings(
+        filename: filename ?? this.filename,
+        pixelRatio: pixelRatio ?? this.pixelRatio);
+  }
+}
diff --git a/flutter-package/lib/src/utils.dart b/flutter-package/lib/src/utils.dart
index 69ed16b..4a6e62e 100644
--- a/flutter-package/lib/src/utils.dart
+++ b/flutter-package/lib/src/utils.dart
@@ -1,6 +1,4 @@
-
-
-const kPreviewMode = bool.fromEnvironment('flutter.preview', defaultValue: false);
+import 'package:preview/src/vm/preview_service.dart';
 
 bool debugAssertPreviewModeRequired([dynamic t]) {
   assert(() {
@@ -10,11 +8,29 @@ bool debugAssertPreviewModeRequired([dynamic t]) {
   return true;
 }
 
+bool debugPreviewPortRequired([dynamic t]) {
+  assert(() {
+    if (kPreviewPort == null) throw PreviewPortRequiredException(t);
+    return true;
+  }());
+  return true;
+}
+
+class PreviewPortRequiredException implements Exception {
+  final dynamic t;
+  const PreviewPortRequiredException([this.t]);
+  @override
+  String toString() =>
+      'Preview port is required for using this widget ${t ?? ''}. \n'
+      'You should not used it inside your app';
+}
+
 class PreviewModeRequiredException implements Exception {
   final dynamic t;
   const PreviewModeRequiredException([this.t]);
   @override
-  String toString() => 'Preview mode is required for using this widget ${t ??''}. \n'
+  String toString() =>
+      'Preview mode is required for using this widget ${t ?? ''}. \n'
       'You should not used it inside your app';
 }
 
diff --git a/flutter-package/lib/src/vm/preview_service.dart b/flutter-package/lib/src/vm/preview_service.dart
new file mode 100644
index 0000000..6b5ea17
--- /dev/null
+++ b/flutter-package/lib/src/vm/preview_service.dart
@@ -0,0 +1,93 @@
+import 'dart:convert';
+import 'dart:typed_data';
+
+import 'package:flutter/foundation.dart';
+import 'package:json_rpc_2/json_rpc_2.dart';
+import 'package:preview/src/utils.dart';
+import 'package:stream_channel/stream_channel.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart' as http;
+
+const kPreviewMode =
+    bool.fromEnvironment('flutter.preview', defaultValue: false);
+
+const kPreviewPort = int.fromEnvironment('preview.port');
+
+String get previewAddress {
+  if (defaultTargetPlatform == TargetPlatform.android) {
+    // AVD uses '10.0.2.2' as an alias of '127.0.0.1'
+    return '10.0.2.2';
+  } else {
+    return '127.0.0.1';
+  }
+}
+
+class PreviewService {
+  static final PreviewService _singleton = PreviewService._internal();
+
+  factory PreviewService() {
+    assert(debugAssertPreviewModeRequired());
+    assert(debugPreviewPortRequired());
+    return _singleton;
+  }
+
+  PreviewService._internal();
+
+  StreamChannel<String> _socket;
+  Peer _server;
+
+  start() async {
+    try {
+      _socket = WebSocketChannel.connect(
+              Uri.parse('ws://$previewAddress:$kPreviewPort/ws'))
+          .cast<String>();
+
+      _server = Peer(_socket.cast<String>(), strictProtocolChecks: false,
+          onUnhandledError: (e, s) {
+        print(e);
+      });
+
+      _server.listen();
+
+      _server.sendNotification('preview.appAttached');
+
+      final response = await _server.sendRequest('preview.getPort');
+
+      print('port$response');
+      print('Preview attached to deamon');
+    } catch (e) {
+      print(e);
+    }
+  }
+
+  requestRestart() {
+    _server.sendNotification('preview.restart');
+  }
+
+  String get _defaultFileName {
+    final now = DateTime.now();
+    return 'Preview ${now.year}-${now.month}-${now.day} ${now.hour}:${now.minute}:${now.second}.png';
+  }
+
+  saveScreenshot(Uint8List bytes, [String filename]) async {
+    final uri = Uri.parse('http://$previewAddress:$kPreviewPort/screenshot');
+
+    final request = new http.MultipartRequest("POST", uri);
+    filename ??= _defaultFileName;
+    var multipartFile = new http.MultipartFile.fromBytes(
+      'file',
+      bytes,
+      filename: filename,
+      contentType: http.MediaType('image', 'png'),
+    );
+
+    request.files.add(multipartFile);
+    var response = await request.send();
+    print(response.statusCode);
+    response.stream.transform(Utf8Decoder()).listen((value) {
+      print(value);
+    });
+    print('Saved $filename');
+  }
+}
diff --git a/flutter-package/pubspec.lock b/flutter-package/pubspec.lock
index 340da30..07d8daf 100644
--- a/flutter-package/pubspec.lock
+++ b/flutter-package/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.12"
+    version: "0.39.13"
   args:
     dependency: "direct main"
     description:
@@ -36,6 +36,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   charcode:
     dependency: transitive
     description:
@@ -56,7 +63,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.14.13"
   convert:
     dependency: transitive
     description:
@@ -136,14 +143,28 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.1"
-  http_parser:
+    version: "0.12.2"
+  http_methods:
     dependency: transitive
+    description:
+      name: http_methods
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  http_parser:
+    dependency: "direct main"
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.4"
+  http_server:
+    dependency: "direct main"
+    description:
+      name: http_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.8+3"
   js:
     dependency: transitive
     description:
@@ -158,13 +179,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  json_rpc_2:
+    dependency: "direct main"
+    description:
+      name: json_rpc_2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.6"
+    version: "0.12.8"
   meta:
     dependency: transitive
     description:
@@ -172,6 +200,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.8"
+  mime:
+    dependency: "direct main"
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.6+3"
   node_interop:
     dependency: transitive
     description:
@@ -214,6 +249,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.4"
+  shelf:
+    dependency: "direct main"
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.7"
+  shelf_router:
+    dependency: "direct main"
+    description:
+      name: shelf_router
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.2"
+  shelf_static:
+    dependency: "direct main"
+    description:
+      name: shelf_static
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.8"
+  shelf_web_socket:
+    dependency: "direct main"
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -234,7 +297,7 @@ packages:
     source: hosted
     version: "1.9.3"
   stream_channel:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
@@ -260,14 +323,14 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.16"
+    version: "0.2.17"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.2.0"
   vector_math:
     dependency: transitive
     description:
@@ -289,6 +352,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.7+15"
+  web_socket_channel:
+    dependency: "direct main"
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   yaml:
     dependency: transitive
     description:
@@ -297,5 +367,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.7.0 <3.0.0"
+  dart: ">=2.9.0-14.0.dev <3.0.0"
   flutter: ">=1.10.0"
diff --git a/flutter-package/pubspec.yaml b/flutter-package/pubspec.yaml
index 0c19509..fdf0052 100644
--- a/flutter-package/pubspec.yaml
+++ b/flutter-package/pubspec.yaml
@@ -1,6 +1,6 @@
 name: preview
-description: Create samples of you widgets and preview them in real time
-version: 0.0.5+2
+description: Create samples of your Flutter widgets and preview them in real time
+version: 0.0.8
 repository: https://github.com/jamesblasco/flutter_preview/
 
 environment:
@@ -18,7 +18,16 @@ dependencies:
   http: '>=0.12.0+2 <0.13.0'
   dart_style: ^1.3.4
   device_frame: ^0.1.0
- 
+  json_rpc_2: ^2.2.1
+  web_socket_channel: ^1.1.0
+  stream_channel: ^2.0.0
+  shelf: ^0.7.7
+  shelf_router: ^0.7.2
+  shelf_web_socket: ^0.2.3
+  shelf_static: ^0.2.8
+  http_server: ^0.9.8+3
+  mime: ^0.9.6+3
+  http_parser: ^3.1.4
  
 #  window_size: 
 #   path: ./plugins/window_size/
diff --git a/screenshots/macos_helper.png b/screenshots/macos_helper.png
new file mode 100644
index 0000000..f84f67d
Binary files /dev/null and b/screenshots/macos_helper.png differ
diff --git a/vscode-extension/LICENSE b/vscode-extension/LICENSE
new file mode 100644
index 0000000..e644f5a
--- /dev/null
+++ b/vscode-extension/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Jaime Blasco 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/vscode-extension/package-lock.json b/vscode-extension/package-lock.json
index 01379fd..2a99a32 100644
--- a/vscode-extension/package-lock.json
+++ b/vscode-extension/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "flutter-preview",
-	"version": "0.0.4",
+	"version": "0.0.8",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -30,6 +30,17 @@
 				"js-tokens": "^4.0.0"
 			}
 		},
+		"@open-rpc/client-js": {
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/@open-rpc/client-js/-/client-js-1.3.3.tgz",
+			"integrity": "sha512-bLTyb0B+PGBDsqAWlpNxMOx/wiLQu4/hU7qZZLYDmsyROLg2KO2VIBoJOKTC7qCPUd471lyORpEVP7/KDyZcvA==",
+			"requires": {
+				"isomorphic-fetch": "^2.2.1",
+				"isomorphic-ws": "^4.0.1",
+				"strict-event-emitter-types": "^2.0.0",
+				"ws": "^7.0.0"
+			}
+		},
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -43,9 +54,9 @@
 			"dev": true
 		},
 		"@types/glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==",
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+			"integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
 			"dev": true,
 			"requires": {
 				"@types/minimatch": "*",
@@ -71,17 +82,24 @@
 			"dev": true
 		},
 		"@types/node": {
-			"version": "13.13.12",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.12.tgz",
-			"integrity": "sha512-zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw==",
-			"dev": true
+			"version": "13.13.14",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.14.tgz",
+			"integrity": "sha512-Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g=="
 		},
 		"@types/vscode": {
-			"version": "1.46.0",
-			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.46.0.tgz",
-			"integrity": "sha512-8m9wPEB2mcRqTWNKs9A9Eqs8DrQZt0qNFO8GkxBOnyW6xR//3s77SoMgb/nY1ctzACsZXwZj3YRTDsn4bAoaUw==",
+			"version": "1.47.0",
+			"resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz",
+			"integrity": "sha512-nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA==",
 			"dev": true
 		},
+		"@types/ws": {
+			"version": "7.2.6",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.6.tgz",
+			"integrity": "sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ==",
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@typescript-eslint/eslint-plugin": {
 			"version": "2.34.0",
 			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz",
@@ -266,6 +284,14 @@
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true
 		},
+		"bufferutil": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz",
+			"integrity": "sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA==",
+			"requires": {
+				"node-gyp-build": "~3.7.0"
+			}
+		},
 		"callsites": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -455,6 +481,24 @@
 			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true
 		},
+		"encoding": {
+			"version": "0.1.13",
+			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+			"requires": {
+				"iconv-lite": "^0.6.2"
+			},
+			"dependencies": {
+				"iconv-lite": {
+					"version": "0.6.2",
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+					"integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3.0.0"
+					}
+				}
+			}
+		},
 		"es-abstract": {
 			"version": "1.17.6",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
@@ -1081,6 +1125,11 @@
 				"has-symbols": "^1.0.1"
 			}
 		},
+		"is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+		},
 		"is-symbol": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -1096,6 +1145,20 @@
 			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 			"dev": true
 		},
+		"isomorphic-fetch": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+			"requires": {
+				"node-fetch": "^1.0.1",
+				"whatwg-fetch": ">=0.10.0"
+			}
+		},
+		"isomorphic-ws": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
+			"integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="
+		},
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1319,6 +1382,20 @@
 				}
 			}
 		},
+		"node-fetch": {
+			"version": "1.7.3",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+			"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+			"requires": {
+				"encoding": "^0.1.11",
+				"is-stream": "^1.0.1"
+			}
+		},
+		"node-gyp-build": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz",
+			"integrity": "sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="
+		},
 		"normalize-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -1542,8 +1619,7 @@
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"semver": {
 			"version": "7.3.2",
@@ -1603,6 +1679,11 @@
 			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
 			"dev": true
 		},
+		"strict-event-emitter-types": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz",
+			"integrity": "sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="
+		},
 		"string-width": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -1780,9 +1861,9 @@
 			"dev": true
 		},
 		"typescript": {
-			"version": "3.9.5",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
-			"integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
+			"version": "3.9.7",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+			"integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
 			"dev": true
 		},
 		"uri-js": {
@@ -1794,6 +1875,14 @@
 				"punycode": "^2.1.0"
 			}
 		},
+		"utf-8-validate": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz",
+			"integrity": "sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw==",
+			"requires": {
+				"node-gyp-build": "~3.7.0"
+			}
+		},
 		"v8-compile-cache": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
@@ -1811,6 +1900,11 @@
 				"rimraf": "^2.6.3"
 			}
 		},
+		"whatwg-fetch": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz",
+			"integrity": "sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w=="
+		},
 		"which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -1925,6 +2019,11 @@
 				"mkdirp": "^0.5.1"
 			}
 		},
+		"ws": {
+			"version": "7.3.1",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
+			"integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
+		},
 		"y18n": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
index 369d452..3b20ac8 100644
--- a/vscode-extension/package.json
+++ b/vscode-extension/package.json
@@ -1,9 +1,9 @@
 {
 	"name": "flutter-preview",
 	"displayName": "Flutter Preview",
-	"description": "Display a preview of your widget while building them",
+	"description": "Display a real-time preview of a Flutter widget while building it",
 	"publisher": "jamesblasco",
-	"version": "0.0.6",
+	"version": "0.0.8",
 	"icon": "images/icon.png",
 	"engines": {
 		"vscode": "^1.46.0"
@@ -74,22 +74,26 @@
 		"test": "node ./out/test/runTest.js"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.46.0",
-		"@types/glob": "^7.1.1",
+		"@types/glob": "^7.1.3",
 		"@types/mocha": "^7.0.2",
-		"@types/node": "^13.11.0",
-		"eslint": "^6.8.0",
-		"@typescript-eslint/parser": "^2.30.0",
+		"@types/node": "^13.13.14",
+		"@types/vscode": "^1.46.0",
 		"@typescript-eslint/eslint-plugin": "^2.30.0",
+		"@typescript-eslint/parser": "^2.30.0",
+		"eslint": "^6.8.0",
 		"glob": "^7.1.6",
 		"mocha": "^7.1.2",
-		"typescript": "^3.8.3",
+		"typescript": "^3.9.7",
 		"vscode-test": "^1.3.0"
 	},
 	"extensionPack": [
 		"dart-code.flutter"
 	],
 	"dependencies": {
-		"tree-kill": "^1.2.2"
+		"@open-rpc/client-js": "^1.3.3",
+		"@types/ws": "^7.2.6",
+		"bufferutil": "^4.0.1",
+		"tree-kill": "^1.2.2",
+		"utf-8-validate": "^5.0.2"
 	}
-}
\ No newline at end of file
+}
diff --git a/vscode-extension/snippets.json b/vscode-extension/snippets.json
index 91ca1b6..f3eca5c 100644
--- a/vscode-extension/snippets.json
+++ b/vscode-extension/snippets.json
@@ -9,6 +9,9 @@
       " @override",
       " List<Preview> get previews { ",
       "  return [",
+      "     Preview( ",
+      "       child: ",
+      "     ),",
       "   ",
       "  ];",
       " }",
diff --git a/vscode-extension/src/preview.ts b/vscode-extension/src/preview.ts
index 0db729f..63d25c1 100644
--- a/vscode-extension/src/preview.ts
+++ b/vscode-extension/src/preview.ts
@@ -2,75 +2,77 @@
 
 import * as vscode from 'vscode';
 
-import { ChildProcess } from 'child_process';
-const kill  = require('tree-kill');
-const spawn = require('child_process').spawn;
+import * as cp from 'child_process';
+import { RcpService } from './rcp';
+const kill = require('tree-kill');
 
-const isActiveContext = 'flutter_preview.isActive';
 
+const isActiveContext = 'flutter_preview.isActive';
+var rcpService: RcpService;
 
 export class PreviewService {
     private readonly disposables: vscode.Disposable[] = [];
 
-    private readonly path: String;
-    private process: ChildProcess | undefined;
+    private readonly path: string;
+    private childProcess: cp.ChildProcess | undefined;
     public isActive: Boolean = false;
 
+
     private currentDocument: vscode.Uri | undefined;
 
-    constructor(path: String) {
+    private rcpService: RcpService | undefined;
+
+    constructor(path: string) {
         this.path = path;
     }
 
     async start() {
+        let self = this;
         if (this.isActive && vscode.debug.activeDebugSession?.name === 'Flutter Preview') {
             vscode.window.showInformationMessage('Flutter preview is already running');
             return;
         }
         this.isActive = true;
         vscode.commands.executeCommand("setContext", isActiveContext, true);
-        this.launchDartPreviewProccess();
-        await this.launchDebugSession();
-        let disp = vscode.workspace.onDidSaveTextDocument((e) => { this.onDidSaveTextEditor(e); });
-        let disp2 = vscode.window.onDidChangeActiveTextEditor((e) => {
+        await this.launchDartPreviewProccess();
 
-            this.onDidUpdateActiveTextEditor();
+        let disp = vscode.workspace.onDidSaveTextDocument((e) => { self.onDidSaveTextEditor(e); });
+        let disp2 = vscode.window.onDidChangeActiveTextEditor((e) => {
+            self.onDidUpdateActiveTextEditor();
         });
         this.disposables.push(disp, disp2);
         this.onDidUpdateActiveTextEditor();
     }
 
-    launchDartPreviewProccess() {
+    async launchDartPreviewProccess() {
+        let self = this;
+        console.log('Set up dart process');
         try {
-            this.process = spawn('flutter', [
+            this.childProcess = cp.spawn('flutter', [
                 'pub',
                 'run',
-                'preview:run'
+                'preview:preview'
             ], { cwd: this.path });
 
+            rcpService = new RcpService(this.childProcess!.stdout!, this.childProcess!.stdin!);
+            var sr = this.rcpService;
+            var ch = this.childProcess;
 
-            this.process?.on('exit', (code) => {
-                console.log('child process exited with code : ', code);
-            });
-
-
-            this.process?.on('error', (err) => {
-                console.log('Error: ', err.toString());
-            });
-            this.process?.stdout?.on('data', function (data) {
-                if (`${data}` === 'Needs reload\n') {
-                    console.log('Hot reload');
-                    vscode.commands.executeCommand('flutter.hotReload');
-                } if (`${data}` === 'Needs restart\n') {
-                    console.log('Hot Restart');
+            rcpService.onNotification((data) => {
+                if (data['method'] === 'preview.restart') {
                     vscode.commands.executeCommand('flutter.hotRestart');
-                } else {
-                    console.log("Got data from child: " + data);
-                }
+                } else if (data['method'] === 'preview.launch') {
+                    let port = data['params']['port'];
+                    self.launchDebugSession(port);
 
+                }
+            });
+            console.log('Finish Set up dart process');
+            this.childProcess?.on('error', (err) => {
+                console.log('Error dart process: ', err.toString());
             });
 
-            this.process?.stderr?.on('data',
+            this.childProcess?.stderr?.on('data',
                 function (data) {
                     console.log('err data: ' + data);
                 }
@@ -81,18 +83,22 @@ export class PreviewService {
     }
 
 
-    private async launchDebugSession() {
+
+
+
+    private async launchDebugSession(port: number) {
 
         const launchConfiguration = {
             type: "dart",
             name: "Flutter Preview",
             request: "launch",
-           // deviceId: "macOS",
+            // deviceId: "macOS",
             cwd: "",
             internalConsoleOptions: "neverOpen",
             args: [
                 "--target=lib/main.preview.dart",
-                "--dart-define=flutter.preview=true"
+                "--dart-define=flutter.preview=true",
+                `--dart-define=preview.port=${port}`
             ],
         };
 
@@ -111,12 +117,14 @@ export class PreviewService {
 
     cancel() {
         console.log('cancel session');
-        
+
         this.isActive = false;
-        if (this.process !== undefined) {
-            kill(this.process.pid, 'SIGKILL');
+        this.rcpService?.dispose();
+        this.rcpService = undefined;
+        if (this.childProcess !== undefined) {
+            kill(this.childProcess.pid, 'SIGKILL');
         }
-        this.process = undefined;
+        this.childProcess = undefined;
         this.disposables.forEach((s) => s.dispose());
         vscode.commands.executeCommand("setContext", isActiveContext, false);
     }
@@ -124,6 +132,8 @@ export class PreviewService {
 
 
 
+
+
     onDidSaveTextEditor(document: vscode.TextDocument) {
         if (document.languageId === "dart" && document.uri === this.currentDocument) {
             this.onDidUpdateActiveTextEditor();
@@ -136,10 +146,17 @@ export class PreviewService {
         const editor = vscode.window.activeTextEditor;
         this.currentDocument = editor?.document?.uri;
         const path = this.currentDocument!.toString().split(":")[1].replace(this.path + '/', '');
-        this.process?.stdin?.write(path + '\n');
+
+        rcpService.request('preview.setActiveFile', { path: path }).then((needsHotReload) => {
+
+            if (needsHotReload) {
+                vscode.commands.executeCommand('flutter.hotReload');
+            }
+        });
     };
 
     dispose() {
+
         this.cancel();
     }
 }
\ No newline at end of file
diff --git a/vscode-extension/src/rcp.ts b/vscode-extension/src/rcp.ts
new file mode 100644
index 0000000..1883132
--- /dev/null
+++ b/vscode-extension/src/rcp.ts
@@ -0,0 +1,80 @@
+
+import * as rpc from "@open-rpc/client-js";
+import * as ev from "events";
+
+const reqUri = 'request';
+const resUri = 'response';
+
+
+
+export class RcpService {
+    private redeable: NodeJS.ReadableStream;
+    private writable: NodeJS.WritableStream;
+    private emitter = new ev.EventEmitter();
+    private transport = new rpc.EventEmitterTransport(this.emitter, reqUri, resUri);
+    private requestManager = new rpc.RequestManager([this.transport]);
+    private client = new rpc.Client(this.requestManager);
+
+    private notificationListeners: Array<(data: any) => void> = [];
+
+    constructor(redeable: NodeJS.ReadableStream, writable: NodeJS.WritableStream) {
+
+        this.redeable = redeable;
+        this.writable = writable;
+
+
+        try {
+            let self = this;
+
+            // Stdout daemon callback
+            this.redeable.on('data', (data) => {
+                self.emitRedeable(data);
+            });
+
+            // Stdin daemon callback
+            this.emitter.on(reqUri, (data) => {
+                let request = JSON.stringify(data);
+                console.log(`Request sent: ${request}`);
+                self.writable.write(request + '\n'); // Send the output correctly from server
+            });
+
+            this.client.onNotification((data) => {
+                self.notificationListeners.forEach((callback) => callback(data));
+            });
+            this.client.onError((error: rpc.JSONRPCError) => {
+                console.log(`Error ${error.message}`);
+            });
+
+
+
+        } catch (e) {
+            console.log(e); // never called
+        }
+
+    }
+
+
+    request(method: string, params?: any, timeout?: number): Promise<any> {
+        return this.client.request(method, params, timeout);
+
+    }
+    
+
+    onNotification(callback: (data: any) => void) {
+        this.notificationListeners.push(callback);
+    }
+
+    private emitRedeable(data: any) {
+        let list = `${data}`.split('\n').filter((e) => e.trim().length !== 0);
+        if (list.length === 0) { return; }
+        let responses = `[ ${list.join(', ')} ]`;
+        console.log(`Response received: ${responses}`);
+        this.emitter.emit(resUri, responses); 
+    }
+
+    dispose() {
+        this.emitter.removeAllListeners();
+    }
+
+}
+
diff --git a/vscode-extension/src/test/suite/index.ts b/vscode-extension/src/test/suite/index.ts
index 7029e38..e69de29 100644
--- a/vscode-extension/src/test/suite/index.ts
+++ b/vscode-extension/src/test/suite/index.ts
@@ -1,38 +0,0 @@
-import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
-
-export function run(): Promise<void> {
-	// Create the mocha test
-	const mocha = new Mocha({
-		ui: 'tdd',
-		color: true
-	});
-
-	const testsRoot = path.resolve(__dirname, '..');
-
-	return new Promise((c, e) => {
-		glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
-			if (err) {
-				return e(err);
-			}
-
-			// Add files to the test suite
-			files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
-
-			try {
-				// Run the mocha test
-				mocha.run(failures => {
-					if (failures > 0) {
-						e(new Error(`${failures} tests failed.`));
-					} else {
-						c();
-					}
-				});
-			} catch (err) {
-				console.error(err);
-				e(err);
-			}
-		});
-	});
-}
diff --git a/vscode-extension/tsconfig.json b/vscode-extension/tsconfig.json
index b65c745..6613816 100644
--- a/vscode-extension/tsconfig.json
+++ b/vscode-extension/tsconfig.json
@@ -1,4 +1,5 @@
 {
+	"esModuleInterop": true,
 	"compilerOptions": {
 		"module": "commonjs",
 		"target": "es6",
@@ -8,6 +9,7 @@
 		],
 		"sourceMap": true,
 		"rootDir": "src",
+		"esModuleInterop": true,
 		"strict": true   /* enable all strict type-checking options */
 		/* Additional Checks */
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */