diff --git a/src/lib/KmlLayer.js b/src/lib/KmlLayer.js
index 9bcab0eb..54291efc 100644
--- a/src/lib/KmlLayer.js
+++ b/src/lib/KmlLayer.js
@@ -1,82 +1,119 @@
+/* global google */
+import _ from "lodash";
+
 import {
   default as React,
-  Component,
   PropTypes,
 } from "react";
 
 import {
-  default as canUseDOM,
-} from "can-use-dom";
+  MAP,
+  KML_LAYER,
+} from "./constants";
 
 import {
-  default as KmlLayerCreator,
-  kmlLayerDefaultPropTypes,
-  kmlLayerControlledPropTypes,
-  kmlLayerEventPropTypes,
-} from "./creators/KmlLayerCreator";
-
-import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
-
-export default class KmlLayer extends Component {
-  static propTypes = {
-    // Uncontrolled default[props] - used only in componentDidMount
-    ...kmlLayerDefaultPropTypes,
-    // Controlled [props] - used in componentDidMount/componentDidUpdate
-    ...kmlLayerControlledPropTypes,
-    // Event [onEventName]
-    ...kmlLayerEventPropTypes,
-  }
-
-  static contextTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
-  }
+  addDefaultPrefixToPropTypes,
+  collectUncontrolledAndControlledProps,
+  default as enhanceElement,
+} from "./enhanceElement";
+
+const controlledPropTypes = {
+  // 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#KmlLayer
+  defaultViewport: PropTypes.any,
+  metadata: PropTypes.any,
+  status: PropTypes.any,
+  url: PropTypes.string,
+  zIndex: PropTypes.number,
+};
+
+const defaultUncontrolledPropTypes = addDefaultPrefixToPropTypes(controlledPropTypes);
+
+const eventMap = {
+  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  onClick: `click`,
+
+  onDefaultViewportChanged: `defaultviewport_changed`,
+  
+  onStatusChanged: `status_changed`,
+};
 
+const publicMethodMap = {
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
   //
   // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
   //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
-  getDefaultViewport() { return this.state.kmlLayer.getDefaultViewport(); }
+  getDefaultViewport(kmlLayer) { return kmlLayer.getDefaultViewport(); },
 
-  getMetadata() { return this.state.kmlLayer.getMetadata(); }
+  getMetadata(kmlLayer) { return kmlLayer.getMetadata(); },
 
-  getStatus() { return this.state.kmlLayer.getStatus(); }
+  getStatus(kmlLayer) { return kmlLayer.getStatus(); },
 
-  getUrl() { return this.state.kmlLayer.getUrl(); }
+  getUrl(kmlLayer) { return kmlLayer.getUrl(); },
 
-  getZIndex() { return this.state.marker.getZIndex(); }
+  getZIndex(kmlLayer) { return kmlLayer.getZIndex(); },
   // END - Public APIs
-  //
-  // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
+};
 
-  state = {
-  }
+const controlledPropUpdaterMap = {
+  defaultViewport(kmlLayer, defaultViewport) { kmlLayer.setDefaultViewport(defaultViewport); },
+  metadata(kmlLayer, metadata) { kmlLayer.setMetadata(metadata); },
+  status(kmlLayer, status) { kmlLayer.setStatus(status); },
+  url(kmlLayer, url) { kmlLayer.setUrl(url); },
+  zIndex(kmlLayer, zIndex) { kmlLayer.setZIndex(zIndex); },
+};
 
-  componentWillMount() {
-    const { mapHolderRef } = this.context;
+function getInstanceFromComponent(component) {
+  return component.state[KML_LAYER];
+}
 
-    if (!canUseDOM) {
-      return;
-    }
-    const kmlLayer = KmlLayerCreator._createKmlLayer({
-      ...this.props,
-      mapHolderRef,
+export default _.flowRight(
+  React.createClass,
+  enhanceElement(getInstanceFromComponent, publicMethodMap, eventMap, controlledPropUpdaterMap),
+)({
+  displayName: `KmlLayer`,
+
+  propTypes: {
+    ...controlledPropTypes,
+    ...defaultUncontrolledPropTypes,
+  },
+
+  contextTypes: {
+    [MAP]: PropTypes.object,
+  },
+
+  getInitialState() {
+    // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
+    const kmlLayer = new google.maps.KmlLayer({
+      map: this.context[MAP],
+      ...collectUncontrolledAndControlledProps(
+        defaultUncontrolledPropTypes,
+        controlledPropTypes,
+        this.props
+      ),
     });
+    return {
+      [KML_LAYER]: kmlLayer,
+    };
+  },
 
-    this.setState({ kmlLayer });
-  }
+  componentWillUnmount() {
+    const kmlLayer = getInstanceFromComponent(this);
+    if (kmlLayer) {
+      kmlLayer.setMap(null);
+    }
+  },
 
   render() {
-    const { mapHolderRef } = this.context;
-    if (this.state.kmlLayer) {
-      return (
-        <KmlLayerCreator mapHolderRef={mapHolderRef} kmlLayer={this.state.kmlLayer} {...this.props}>
-          {this.props.children}
-        </KmlLayerCreator>
-      );
-    } else {
-      return (<noscript />);
-    }
-  }
-}
+    return false;
+  },
+});
diff --git a/src/lib/constants.js b/src/lib/constants.js
index fdb6ab7d..71f17f86 100644
--- a/src/lib/constants.js
+++ b/src/lib/constants.js
@@ -11,3 +11,5 @@ export const POLYLINE = `__SECRET_POLYLINE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
 export const POLYGON = `__SECRET_POLYGON_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
 
 export const CIRCLE = `__SECRET_CIRCLE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
+
+export const KML_LAYER = `__SECRET_KML_LAYER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED`;
diff --git a/src/lib/creators/KmlLayerCreator.js b/src/lib/creators/KmlLayerCreator.js
deleted file mode 100644
index 6c155212..00000000
--- a/src/lib/creators/KmlLayerCreator.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/* global google */
-import {
-  default as React,
-  PropTypes,
-  Component,
-  Children,
-} from "react";
-
-import { default as KmlLayerEventList } from "../eventLists/KmlLayerEventList";
-import { default as eventHandlerCreator } from "../utils/eventHandlerCreator";
-import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
-import { default as composeOptions } from "../utils/composeOptions";
-import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
-
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
-export const kmlLayerControlledPropTypes = {
-// 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#KmlLayer
-  defaultViewport: PropTypes.any,
-  metadata: PropTypes.any,
-  status: PropTypes.any,
-  url: PropTypes.string,
-  zIndex: PropTypes.number,
-};
-
-export const kmlLayerDefaultPropTypes = defaultPropsCreator(kmlLayerControlledPropTypes);
-
-const kmlLayerUpdaters = {
-  defaultViewport(defaultViewport, component) {
-    component.getKmlLayer().setDefaultViewport(defaultViewport);
-  },
-  metadata(metadata, component) { component.getKmlLayer().setMetadata(metadata); },
-  status(status, component) { component.getKmlLayer().setStatus(status); },
-  url(url, component) { component.getKmlLayer().setUrl(url); },
-  zIndex(zIndex, component) { component.getKmlLayer().setZIndex(zIndex); },
-};
-
-const { eventPropTypes, registerEvents } = eventHandlerCreator(KmlLayerEventList);
-
-export const kmlLayerEventPropTypes = eventPropTypes;
-
-class KmlLayerCreator extends Component {
-
-  static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
-    kmlLayer: PropTypes.object.isRequired,
-  }
-
-  static _createKmlLayer(kmlLayerProps) {
-    const { mapHolderRef } = kmlLayerProps;
-    // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
-    const kmlLayer = new google.maps.KmlLayer(
-      composeOptions(kmlLayerProps, kmlLayerControlledPropTypes)
-    );
-
-    kmlLayer.setMap(mapHolderRef.getMap());
-
-    return kmlLayer;
-  }
-
-  getKmlLayer() {
-    return this.props.kmlLayer;
-  }
-
-  render() {
-    const { mapHolderRef, children } = this.props;
-
-    if (Children.count(children) > 0) {
-      return (
-        <div>{Children.map(children, childElement =>
-          childElement && React.cloneElement(childElement, {
-            mapHolderRef,
-          })
-        )}</div>
-      );
-    } else {
-      return (<noscript />);
-    }
-  }
-}
-
-export default componentLifecycleDecorator({
-  registerEvents,
-  instanceMethodName: `getKmlLayer`,
-  updaters: kmlLayerUpdaters,
-})(KmlLayerCreator);
diff --git a/src/lib/eventLists/KmlLayerEventList.js b/src/lib/eventLists/KmlLayerEventList.js
deleted file mode 100644
index 9c72716e..00000000
--- a/src/lib/eventLists/KmlLayerEventList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
-// [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
-export default [
-  `click`,
-  `defaultviewport_changed`,
-  `status_changed`,
-];
diff --git a/src/lib/index.js b/src/lib/index.js
index 314be4c2..d3e2a81f 100644
--- a/src/lib/index.js
+++ b/src/lib/index.js
@@ -25,3 +25,7 @@ export {
 export {
   default as Circle,
 } from "./Circle";
+
+export {
+  default as KmlLayer,
+} from "./KmlLayer";