diff --git a/dist/module/exceptions.js.flow b/dist/module/exceptions.js.flow
new file mode 100644
index 0000000..6759510
--- /dev/null
+++ b/dist/module/exceptions.js.flow
@@ -0,0 +1,8 @@
+/* @flow */
+import type { ZalgoPromise } from './promise';
+const dispatchedErrors = [];
+const possiblyUnhandledPromiseHandlers: Array<(mixed, promise?: ZalgoPromise<mixed>) => void> = [];
+declare export function dispatchPossiblyUnhandledError<T>(err: mixed, promise: ZalgoPromise<T>): any;
+declare export function onPossiblyUnhandledException(handler: (mixed, promise?: ZalgoPromise<mixed>) => void): {|
+  cancel: () => void
+|};
\ No newline at end of file
diff --git a/dist/module/export.js.flow b/dist/module/export.js.flow
new file mode 100644
index 0000000..7c6de17
--- /dev/null
+++ b/dist/module/export.js.flow
@@ -0,0 +1,6 @@
+/* @flow */
+// $FlowFixMe
+module.exports = require('./promise').ZalgoPromise; // eslint-disable-line import/no-commonjs
+// $FlowFixMe
+
+module.exports.ZalgoPromise = require('./promise').ZalgoPromise; // eslint-disable-line import/no-commonjs
\ No newline at end of file
diff --git a/dist/module/flush.js.flow b/dist/module/flush.js.flow
new file mode 100644
index 0000000..0f585de
--- /dev/null
+++ b/dist/module/flush.js.flow
@@ -0,0 +1,8 @@
+/* @flow */
+import type { ZalgoPromise } from './promise';
+let activeCount = 0;
+let flushPromise;
+declare function flushActive(): any;
+declare export function startActive(): any;
+declare export function endActive(): any;
+declare export function awaitActive(Zalgo: Class<ZalgoPromise<*>>): ZalgoPromise<void>;
\ No newline at end of file
diff --git a/dist/module/index.js.flow b/dist/module/index.js.flow
index 4c283e1..ee4b4ad 100644
--- a/dist/module/index.js.flow
+++ b/dist/module/index.js.flow
@@ -1,52 +1,2 @@
-// @flow
-
-declare class Class0 {
-  static $call(message?: string): Class0;
-  static captureStackTrace(target: Object, constructor?: Function): void;
-  static prepareStackTrace: (err: Class0, stack: Array<CallSite>) => mixed;
-  static stackTraceLimit: number;
-
-  columnNumber?: number;
-  description?: string;
-  fileName?: string;
-  lineNumber?: number;
-  message: string;
-  name: string;
-  number?: number;
-  stack: string;
-  constructor(message?: mixed): void;
-  toString(): string;
-}
-declare export class ZalgoPromise<R> {
-  static all<X: [mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | [mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */, mixed /* UNEXPECTED TYPE: ExistsT */] | Array<mixed>>(promises: X): ZalgoPromise<mixed /* UNEXPECTED TYPE: EvalT */>;
-  static asyncReject(error: mixed): ZalgoPromise<R>;
-  static delay(delay: number): ZalgoPromise<void>;
-  static flush(): ZalgoPromise<void>;
-  static hash<O: {[_: string]: mixed /* UNEXPECTED TYPE: ExistsT */}>(promises: O): ZalgoPromise<mixed /* UNEXPECTED TYPE: EvalT */>;
-  static isPromise(value: mixed): boolean;
-  static map<T, X>(items: Array<T>, method: (_: T) => ZalgoPromise<X> | X): ZalgoPromise<Array<X>>;
-  static onPossiblyUnhandledException(handler: (err: mixed) => void): {cancel: () => void};
-  static reject(error: mixed): ZalgoPromise<R>;
-  static resolve<X>(value: X | ZalgoPromise<X>): ZalgoPromise<X>;
-  static try<X, Y, C, A: Array<mixed>>(method: (...args: A) => ZalgoPromise<X> | Y, context: ?C, args: ?A): ZalgoPromise<X | Y>;
-
-  dispatching: boolean;
-  error: mixed;
-  errorHandled: boolean;
-  handlers: Array<{onError: void | (error: mixed) => mixed, onSuccess: void | (result: R) => mixed, promise: ZalgoPromise<mixed /* UNEXPECTED TYPE: ExistsT */>}>;
-  rejected: boolean;
-  resolved: boolean;
-  stack: string;
-  value: R;
-  asyncReject(error: mixed): ZalgoPromise<R>;
-  catch<X, Y>(onError: (error: mixed) => ZalgoPromise<X> | Y): ZalgoPromise<X | Y>;
-  constructor(handler: ?(resolve: (result: R) => void, reject: (error: mixed) => void) => void): any;
-  dispatch(): any;
-  finally(onFinally: () => mixed): ZalgoPromise<R>;
-  reject(error: mixed): ZalgoPromise<R>;
-  resolve(result: R): ZalgoPromise<R>;
-  then<X, Y>(onSuccess: void | (result: R) => ZalgoPromise<X> | Y, onError: void | (error: mixed) => ZalgoPromise<X> | Y): ZalgoPromise<X | Y>;
-  timeout(time: number, err: ?Class0): ZalgoPromise<R>;
-  toPromise(): Class<Promise<R>> | Class<Promise> | Promise<+R>;
-}
-
+/* @flow */
+export { ZalgoPromise } from './promise';
\ No newline at end of file
diff --git a/dist/module/promise.js.flow b/dist/module/promise.js.flow
new file mode 100644
index 0000000..cf0b995
--- /dev/null
+++ b/dist/module/promise.js.flow
@@ -0,0 +1,42 @@
+/* @flow */
+import { isPromise } from './utils';
+import { onPossiblyUnhandledException, dispatchPossiblyUnhandledError } from './exceptions';
+import { startActive, endActive, awaitActive } from './flush';
+declare export class ZalgoPromise<R: mixed> {
+  resolved: boolean,
+  rejected: boolean,
+  errorHandled: boolean,
+  value: R,
+  error: mixed,
+  handlers: Array<{|
+    promise: ZalgoPromise<*>,
+    onSuccess: void | ((result: R) => mixed),
+    onError: void | ((error: mixed) => mixed),
+  |}>,
+  dispatching: boolean,
+  stack: string,
+  constructor(handler: ?(resolve: (result: R) => void, reject: (error: mixed) => void) => void): any,
+  resolve(result: R): ZalgoPromise<R>,
+  reject(error: mixed): ZalgoPromise<R>,
+  asyncReject(error: mixed): ZalgoPromise<R>,
+  dispatch(): any,
+  then<X, Y>(onSuccess: void | ((result: R) => ZalgoPromise<X> | Y), onError: void | ((error: mixed) => ZalgoPromise<X> | Y)): ZalgoPromise<X | Y>,
+  catch<X, Y>(onError: (error: mixed) => ZalgoPromise<X> | Y): ZalgoPromise<X | Y>,
+  finally(onFinally: () => mixed): ZalgoPromise<R>,
+  timeout(time: number, err: ?Error): ZalgoPromise<R>,
+  toPromise(): Promise<R>,
+  lazy(): ZalgoPromise<R>,
+  static resolve<X, Y>(value: ZalgoPromise<X> | Y): ZalgoPromise<X | Y>,
+  static reject(error: mixed): ZalgoPromise<R>,
+  static asyncReject(error: mixed): ZalgoPromise<R>,
+  static all<X: $ReadOnlyArray<mixed>>(promises: X): ZalgoPromise<$TupleMap<X, <Y>(ZalgoPromise<Y> | Y) => Y>>,
+  static hash<O: Object>(promises: O): ZalgoPromise<$ObjMap<O, <Y>(ZalgoPromise<Y> | Y) => Y>>,
+  static map<T, X>(items: $ReadOnlyArray<T>, method: (T) => ZalgoPromise<X> | X): ZalgoPromise<$ReadOnlyArray<X>>,
+  static onPossiblyUnhandledException(handler: (err: mixed) => void): {|
+    cancel: () => void
+  |},
+  static try<X, Y, C: mixed, A: $ReadOnlyArray<mixed>>(method: (...args: $ReadOnlyArray<mixed>) => ZalgoPromise<X> | Y, context?: C, args?: A): ZalgoPromise<X | Y>,
+  static delay(delay: number): ZalgoPromise<void>,
+  static isPromise(value: mixed): boolean,
+  static flush(): ZalgoPromise<void>,
+}
\ No newline at end of file
diff --git a/dist/module/types.js.flow b/dist/module/types.js.flow
new file mode 100644
index 0000000..1146ccb
--- /dev/null
+++ b/dist/module/types.js.flow
@@ -0,0 +1,4 @@
+/* @flow */
+export type ZalgoPromiseConstructorType = (resolve: (mixed) => void, reject: (mixed) => void) => void; // export something to force webpack to see this as an ES module
+
+export const TYPES = true;
\ No newline at end of file
diff --git a/dist/module/utils.js.flow b/dist/module/utils.js.flow
new file mode 100644
index 0000000..3e93aee
--- /dev/null
+++ b/dist/module/utils.js.flow
@@ -0,0 +1,2 @@
+/* @flow */
+declare export function isPromise(item: mixed): boolean;
\ No newline at end of file
diff --git a/package.json b/package.json
index 565e3c0..f8167e8 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,13 @@
     "setup": "npm install && npm run flow-typed",
     "lint": "eslint src/ test/ *.js",
     "flow-typed": "flow-typed install",
+    "build:types": "gen-flow-files src --out-dir dist/module",
     "flow": "flow",
     "karma": "cross-env NODE_ENV=test babel-node --plugins=transform-es2015-modules-commonjs ./node_modules/.bin/karma start",
     "babel": "babel src/ --out-dir dist/module",
     "webpack": "babel-node --plugins=transform-es2015-modules-commonjs ./node_modules/.bin/webpack --display-optimization-bailout --progress",
     "test": "npm run lint && npm run flow-typed && npm run flow && npm run karma",
-    "build": "npm run test && npm run babel && npm run webpack",
+    "build": "npm run test && npm run babel && npm run webpack && npm run build:types",
     "release": "./publish.sh",
     "release:patch": "./publish.sh patch",
     "release:minor": "./publish.sh minor",
@@ -41,6 +42,7 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "flow-bin": "0.155.0",
+    "gen-flow-files": "^0.4.11",
     "grumbler-scripts": "^3",
     "mocha": "^4"
   },