diff --git a/src/lib/InfoWindow.js b/src/lib/InfoWindow.js
index 17c94d14..82dc732f 100644
--- a/src/lib/InfoWindow.js
+++ b/src/lib/InfoWindow.js
@@ -1,77 +1,160 @@
+/* global google */
+import _ from "lodash";
+
+import invariant from "invariant";
+
 import {
   default as React,
-  Component,
   PropTypes,
+  Children,
 } from "react";
 
 import {
-  default as canUseDOM,
-} from "can-use-dom";
+  render,
+  unmountComponentAtNode,
+} from "react-dom";
 
 import {
-  default as InfoWindowCreator,
-  infoWindowDefaultPropTypes,
-  infoWindowControlledPropTypes,
-  infoWindowEventPropTypes,
-} from "./creators/InfoWindowCreator";
-
-import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
-
-export default class InfoWindow extends Component {
-  static propTypes = {
-    // Uncontrolled default[props] - used only in componentDidMount
-    ...infoWindowDefaultPropTypes,
-    // Controlled [props] - used in componentDidMount/componentDidUpdate
-    ...infoWindowControlledPropTypes,
-    // Event [onEventName]
-    ...infoWindowEventPropTypes,
-  }
+  MAP,
+  ANCHOR,
+  INFO_WINDOW,
+} from "./constants";
 
-  static contextTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
-  }
+import {
+  addDefaultPrefixToPropTypes,
+  collectUncontrolledAndControlledProps,
+  default as enhanceElement,
+} from "./enhanceElement";
 
-  // Public APIs
+const controlledPropTypes = {
+  // NOTICE!!!!!!
   //
-  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
+  // Only expose those with getters & setters in the table as controlled props.
   //
+  // [].map.call($0.querySelectorAll("tr>td>code", function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^set/) && !it.match(/^setMap/); })
+  //
+  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
+  children: PropTypes.element,
+  options: PropTypes.object,
+  position: PropTypes.any,
+  zIndex: PropTypes.number,
+};
+
+const defaultUncontrolledPropTypes = addDefaultPrefixToPropTypes(controlledPropTypes);
+
+const eventMap = {
+  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
   // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
-  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
-  getContent() { /* TODO: children */ }
+  onCloseClick: `closeclick`,
+  
+  onContentChanged: `content_changed`,
 
-  getPosition() { return this.state.infoWindow.getPosition(); }
+  onDomReady: `domready`,
 
-  getZIndex() { return this.state.infoWindow.getZIndex(); }
-  // END - Public APIs
+  onPositionChanged: `position_changed`,
+
+  onZIndexChanged: `zindex_changed`,
+};
+
+const publicMethodMap = {
+  // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
+  //
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  getPosition(infoWindow) { return infoWindow.getPosition(); },
 
-  state = {
+  getZIndex(infoWindow) { return infoWindow.getZIndex(); },
+  // END - Public APIs
+};
+
+const controlledPropUpdaterMap = {
+  children(infoWindow, children) {
+    render(Children.only(children), infoWindow.getContent());
+  },
+  options(infoWindow, options) { infoWindow.setOptions(options); },
+  position(infoWindow, position) { infoWindow.setPosition(position); },
+  zIndex(infoWindow, zIndex) { infoWindow.setZIndex(zIndex); },
+};
+
+function getInstanceFromComponent(component) {
+  return component.state[INFO_WINDOW];
+}
+
+function openInfoWindow(context, infoWindow) {
+  const map = context[MAP];
+  const anchor = context[ANCHOR];
+  if (anchor) {
+    infoWindow.open(map, anchor);
+  } else if (infoWindow.getPosition()) {
+    infoWindow.open(map);
+  } else {
+    invariant(false,
+`You must provide either an anchor (typically a <Marker>) or a position for <InfoWindow>.`
+    );
   }
+}
 
-  componentWillMount() {
-    const { mapHolderRef } = this.context;
+export default _.flowRight(
+  React.createClass,
+  enhanceElement(getInstanceFromComponent, publicMethodMap, eventMap, controlledPropUpdaterMap),
+)({
+  displayName: `InfoWindow`,
 
-    if (!canUseDOM) {
-      return;
-    }
-    const infoWindow = InfoWindowCreator._createInfoWindow({
-      ...this.props,
-      mapHolderRef,
+  propTypes: {
+    ...controlledPropTypes,
+    ...defaultUncontrolledPropTypes,
+  },
+
+  contextTypes: {
+    [MAP]: PropTypes.object,
+    [ANCHOR]: PropTypes.object,
+  },
+
+  getInitialState() {
+    const map = this.context[MAP];
+    // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
+    const infoWindow = new google.maps.InfoWindow({
+      map,
+      ...collectUncontrolledAndControlledProps(
+        defaultUncontrolledPropTypes,
+        controlledPropTypes,
+        this.props
+      ),
+      // Override props of ReactElement type
+      content: document.createElement(`div`),
+      children: undefined,
     });
+    openInfoWindow(this.context, infoWindow);
+    return {
+      [INFO_WINDOW]: infoWindow,
+    };
+  },
 
-    this.setState({ infoWindow });
-  }
+  componentDidMount() {
+    const infoWindow = getInstanceFromComponent(this);
+    controlledPropUpdaterMap.children(infoWindow, this.props.children);
+  },
 
-  render() {
-    if (this.state.infoWindow) {
-      return (
-        <InfoWindowCreator infoWindow={this.state.infoWindow} {...this.props}>
-          {this.props.children}
-        </InfoWindowCreator>
-      );
-    } else {
-      return (<noscript />);
+  componentWillReceiveProps(nextProps, nextContext) {
+    const anchorChanged = this.context[ANCHOR] !== nextContext[ANCHOR];
+    if (anchorChanged) {
+      const infoWindow = getInstanceFromComponent(this);
+      openInfoWindow(nextContext, infoWindow);
     }
-  }
-}
+  },
+
+  componentWillUnmount() {
+    const infoWindow = getInstanceFromComponent(this);
+    if (infoWindow) {
+      unmountComponentAtNode(infoWindow.getContent());
+      infoWindow.setMap(null);
+    }
+  },
+
+  render() {
+    return false;
+  },
+});
diff --git a/src/lib/Marker.js b/src/lib/Marker.js
index 1603baf3..787b6b3d 100644
--- a/src/lib/Marker.js
+++ b/src/lib/Marker.js
@@ -9,6 +9,7 @@ import {
 import {
   MAP,
   MARKER,
+  ANCHOR,
 } from "./constants";
 
 import {
@@ -193,6 +194,10 @@ export default _.flowRight(
     [MAP]: PropTypes.object,
   },
 
+  childContextTypes: {
+    [ANCHOR]: PropTypes.object,
+  },
+
   getInitialState() {
     // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Marker
     const marker = new google.maps.Marker({
@@ -208,6 +213,12 @@ export default _.flowRight(
     };
   },
 
+  getChildContext() {
+    return {
+      [ANCHOR]: this.state[MARKER],
+    };
+  },
+
   componentWillUnmount() {
     const marker = getInstanceFromComponent(this);
     if (marker) {
@@ -216,6 +227,14 @@ export default _.flowRight(
   },
 
   render() {
-    return false;
+    const {
+      children,
+    } = this.props;
+
+    return (
+      <div>
+        {children}
+      </div>
+    );
   },
 });
diff --git a/src/lib/constants.js b/src/lib/constants.js
index fb6a5fd4..3390ba86 100644
--- a/src/lib/constants.js
+++ b/src/lib/constants.js
@@ -17,3 +17,7 @@ export const KML_LAYER = `__SECRET_KML_LAYER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
 export const DIRECTIONS_RENDERER = `__SECRET_DIRECTIONS_RENDERER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
 
 export const HEATMAP_LAYER = `__SECRET_HEATMAP_LAYER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
+
+export const ANCHOR = `__SECRET_ANCHOR_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
+
+export const INFO_WINDOW = `__SECRET_INFO_WINDOW_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
diff --git a/src/lib/creators/InfoWindowCreator.js b/src/lib/creators/InfoWindowCreator.js
deleted file mode 100644
index d394e615..00000000
--- a/src/lib/creators/InfoWindowCreator.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/* global google */
-import {
-  default as React,
-  PropTypes,
-  Component,
-} from "react";
-
-import { default as InfoWindowEventList } from "../eventLists/InfoWindowEventList";
-import { default as eventHandlerCreator } from "../utils/eventHandlerCreator";
-import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
-import { default as composeOptions } from "../utils/composeOptions";
-
-import {
-  default as setContentForOptionalReactElement,
-} from "../utils/setContentForOptionalReactElement";
-
-import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
-
-export const infoWindowControlledPropTypes = {
-// NOTICE!!!!!!
-//
-// Only expose those with getters & setters in the table as controlled props.
-//
-// [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
-//    .filter(function(it){ return it.match(/^set/) && !it.match(/^setMap/); })
-//
-// https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
-  content: PropTypes.any,
-  options: PropTypes.object,
-  position: PropTypes.any,
-  zIndex: PropTypes.number,
-};
-
-export const infoWindowDefaultPropTypes = defaultPropsCreator(infoWindowControlledPropTypes);
-
-const infoWindowUpdaters = {
-  children(children, component) {
-    setContentForOptionalReactElement(children, component.getInfoWindow());
-  },
-  content(content, component) { component.getInfoWindow().setContent(content); },
-  options(options, component) { component.getInfoWindow().setOptions(options); },
-  position(position, component) { component.getInfoWindow().setPosition(position); },
-  zIndex(zIndex, component) { component.getInfoWindow().setZIndex(zIndex); },
-};
-
-const { eventPropTypes, registerEvents } = eventHandlerCreator(InfoWindowEventList);
-
-export const infoWindowEventPropTypes = eventPropTypes;
-
-class InfoWindowCreator extends Component {
-
-  static propTypes = {
-    infoWindow: PropTypes.object.isRequired,
-    anchorHolderRef: PropTypes.object,
-  }
-
-  static _createInfoWindow(infoWindowProps) {
-    const { mapHolderRef, anchorHolderRef } = infoWindowProps;
-    // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
-    const infoWindow = new google.maps.InfoWindow(
-      composeOptions(infoWindowProps, infoWindowControlledPropTypes)
-    );
-
-    if (infoWindowProps.children) {
-      setContentForOptionalReactElement(infoWindowProps.children, infoWindow);
-    }
-
-    if (anchorHolderRef) {
-      infoWindow.open(mapHolderRef.getMap(), anchorHolderRef.getAnchor());
-    } else {
-      infoWindow.setMap(mapHolderRef.getMap());
-    }
-
-    return infoWindow;
-  }
-
-  getInfoWindow() {
-    return this.props.infoWindow;
-  }
-
-  render() {
-    return (<noscript />);
-  }
-}
-
-export default componentLifecycleDecorator({
-  registerEvents,
-  instanceMethodName: `getInfoWindow`,
-  updaters: infoWindowUpdaters,
-})(InfoWindowCreator);
diff --git a/src/lib/eventLists/InfoWindowEventList.js b/src/lib/eventLists/InfoWindowEventList.js
deleted file mode 100644
index 2bb42da8..00000000
--- a/src/lib/eventLists/InfoWindowEventList.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
-// [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
-export default [
-  `closeclick`,
-  `content_changed`,
-  `domready`,
-  `position_changed`,
-  `zindex_changed`,
-];
diff --git a/src/lib/index.js b/src/lib/index.js
index 415f8a79..4ba41a11 100644
--- a/src/lib/index.js
+++ b/src/lib/index.js
@@ -37,3 +37,7 @@ export {
 export {
   default as HeatmapLayer,
 } from "./HeatmapLayer";
+
+export {
+  default as InfoWindow,
+} from "./InfoWindow";
diff --git a/src/lib/utils/setContentForOptionalReactElement.js b/src/lib/utils/setContentForOptionalReactElement.js
deleted file mode 100644
index 90649f65..00000000
--- a/src/lib/utils/setContentForOptionalReactElement.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import {
-  default as React,
-  Children,
-} from "react";
-
-import {
-  render,
-} from "react-dom";
-
-function renderElement(
-  contentElement,
-  possiblePrevContent
-) {
-  let prevContent = possiblePrevContent;
-  if (`[object HTMLDivElement]` !== Object.prototype.toString.call(prevContent)) {
-    prevContent = document.createElement(`div`);
-  }
-
-  render(contentElement, prevContent);
-  return prevContent;
-}
-
-export default function setContentForOptionalReactElement(
-  contentOptionalReactElement,
-  infoWindowLikeInstance
-) {
-  if (React.isValidElement(contentOptionalReactElement)) {
-    const contentElement = Children.only(contentOptionalReactElement);
-    const prevContent = infoWindowLikeInstance.getContent();
-
-    const domEl = renderElement(contentElement, prevContent);
-    infoWindowLikeInstance.setContent(domEl);
-  } else {
-    infoWindowLikeInstance.setContent(contentOptionalReactElement);
-  }
-}