diff --git a/google-map-search.html b/google-map-search.html
new file mode 100644
index 0000000..ffbdeec
--- /dev/null
+++ b/google-map-search.html
@@ -0,0 +1,24 @@
+<link rel="import" href="../polymer/polymer.html">
+
+<polymer-element name="google-map-search" attributes="query result map">
+  <script>
+    Polymer('google-map-search', {
+      result: {
+        latitude: '37.77493',
+        longitude: '-122.41942',
+        show: false
+      },
+      search: function() {
+        var places = new google.maps.places.PlacesService(this.map);
+        places.textSearch({query: this.query}, this.gotResults.bind(this));
+      },
+      gotResults: function(results, status) {
+        this.result = {
+          latitude: results[0].geometry.location.lat(),
+          longitude: results[0].geometry.location.lng(),
+          show: true
+        }
+      }
+    });
+  </script>
+</polymer-element>
\ No newline at end of file
diff --git a/google-map.html b/google-map.html
index f5d7ffd..2f31047 100644
--- a/google-map.html
+++ b/google-map.html
@@ -26,7 +26,7 @@
   <script>
     (function() {
       var CALLBACK_NAME = 'polymer_google_map_callback';
-      var MAP_URL = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=' + CALLBACK_NAME;
+      var MAP_URL = 'https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=places&sensor=false&callback=' + CALLBACK_NAME;
       var pendingCallbacks = [];
       var loading;
       
diff --git a/metadata.html b/metadata.html
index 454ae78..4ce3485 100644
--- a/metadata.html
+++ b/metadata.html
@@ -16,4 +16,13 @@
   <template id="imports">
     <link rel="import" href="google-map-directions.html">
   </template>
-</x-meta>
\ No newline at end of file
+</x-meta>
+
+<x-meta id="google-map-search" label="Google Map Search">
+	<template>
+		<google-map-search></google-map-search>
+	</template>
+  <template id="imports">
+    <link rel="import" href="google-map-search.html">
+  </template>
+</x-meta>