diff --git a/src/photos-google-share-point.c b/src/photos-google-share-point.c
new file mode 100644
index 0000000..3cf2723
--- /dev/null
+++ b/src/photos-google-share-point.c
@@ -0,0 +1,102 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/* Based on code from:
+ *   + Documents
+ */
+
+ #include "config.h"
+
+#include <gio/gio.h>
+
+#include "photos-filterable.h"
+#include "photos-share-point.h"
+#include "photos-google-share-point.h"
+
+struct _PhotosGoogleSharePoint
+{
+  PhotosSharePoint parent_instance;
+  GDataPicasaWebService *service;
+};
+
+struct _PhotosGoogleSharePointClass
+{
+  PhotosSharePointClass parent_class;
+};
+
+
+G_DEFINE_TYPE_WITH_CODE (PhotosGoogleSharePoint, photos_google_share_point, PHOTOS_TYPE_SHARE_POINT,
+                         photos_utils_ensure_extension_points ();
+                         g_io_extension_point_implement (PHOTOS_SHARE_POINT_EXTENSION_POINT_NAME,
+                                                         g_define_type_id,
+                                                         "google",
+                                                         0));
+
+static void
+photos_google_share_point_init (PhotosGoogleSharePoint *self)
+{
+  self->service = NULL;
+}
+
+static void
+photos_google_share_point_dispose (GObject *object)
+{
+  PhotosGoogleSharePoint *self = PHOTOS_GOOGLE_SHARE_POINT (object);
+
+  g_clear_object (&self->service);
+
+  G_OBJECT_CLASS (photos_google_share_point_parent_class)->dispose (object);
+}
+
+static void
+photos_google_share_point_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (photos_google_share_point_parent_class)->finalize (object);
+}
+
+static void
+photos_google_share_point_share (PhotosSharePoint *share_point, PhotosBaseItem *item)
+{
+  PhotosSource *source;
+  GoaObject *goa_object;
+  GoaAccount *account;
+
+  source = photos_share_point_get_source (PHOTOS_SHARE_POINT (share_point));
+  goa_object = photos_source_get_goa_object (source);
+  account = goa_object_get_account (goa_object);
+
+  printf("The Account is: %s\n", goa_account_get_provider_type (account));
+  printf("Base item : %s\n", photos_base_item_get_where(item) );
+  //sharing logic flows from here as per the earlier patch.
+  printf("Looks Good to me!\n");
+}
+
+
+static void
+photos_google_share_point_class_init (PhotosGoogleSharePointClass *class)
+{
+
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  PhotosSharePointClass *share_point_class = PHOTOS_SHARE_POINT_CLASS (class);
+
+  object_class->dispose = photos_share_point_dispose;
+  object_class->finalize = photos_share_point_finalize;
+  share_point_class->share = photos_google_share_point_share;
+}
\ No newline at end of file
diff --git a/src/photos-google-share-point.h b/src/photos-google-share-point.h
new file mode 100644
index 0000000..c88c99e
--- /dev/null
+++ b/src/photos-google-share-point.h
@@ -0,0 +1,50 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Umang Jain
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+
+#ifndef PHOTOS_GOOGLE_SHARE_POINT_H
+#define PHOTOS_GOOGLE_SHARE_POINT_H
+
+#include <glib-object.h>
+#include <goa/goa.h>
+#include <gdata/gdata.h>
+#include <gdata/gdata-goa-authorizer.h>
+
+#include "photos-source.h"
+#include "photos-base-item.h"
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_SOURCE (photos_google_share_point_get_type ())
+
+#define PHOTOS_GOOGLE_SHARE_POINT(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   PHOTOS_TYPE_SOURCE, PhotosGoogleSharePoint))
+
+#define PHOTOS_IS_SOURCE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   PHOTOS_TYPE_SOURCE))
+
+typedef struct _PhotosGoogleSharePoint        PhotosGoogleSharePoint;
+typedef struct _PhotosGoogleSharePointClass   PhotosGoogleSharePointClass;
+
+G_END_DECLS
+
+#endif /* PHOTOS_GOOGLE_SHARE_POINT_H */
\ No newline at end of file
diff --git a/src/photos-share-dialog.c b/src/photos-share-dialog.c
new file mode 100644
index 0000000..2f17f3b
--- /dev/null
+++ b/src/photos-share-dialog.c
@@ -0,0 +1,195 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Umang Jain
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
+#include "photos-share-dialog.h"
+#include "photos-utils.h"
+#include "photos-icons.h"
+#include "photos-base-item.h"
+#include "photos-share-point-manager.h"
+
+struct _PhotosShareDialog
+{
+  GtkDialog parent_instance;
+  PhotosSharePointManager *mngr;
+  GCancellable *cancellable;
+  GtkWidget *flow_box;
+  PhotosBaseItem *item;
+};
+
+
+struct _PhotosShareDialogClass
+{
+  GtkDialogClass parent_class;
+};
+
+
+enum
+{
+  PROP_0,
+  PROP_ITEM
+};
+
+
+G_DEFINE_TYPE (PhotosShareDialog, photos_share_dialog, GTK_TYPE_DIALOG);
+
+static void
+photos_share_dialog_button_clicked (PhotosSharePoint *share_point)
+{
+  g_return_if_fail (self != NULL);
+
+  photos_share_point_share (share_point);
+  g_signal_emit_by_name (self, "response");
+}
+
+
+static void
+photos_share_dialog_constructed (GObject *object)
+{
+  PhotosShareDialog *self = PHOTOS_SHARE_DIALOG (object);
+  PhotosSharePoint *share_point;
+  PhotosSource *source;
+  GHashTable *share_points;
+  GtkWidget *child;
+  GtkWidget *button;
+  GtkWidget *grid;
+  GtkWidget *image;
+  GtkWidget *label;
+  GIcon *icon;
+  const gchar *name;
+
+  G_OBJECT_CLASS (photos_share_dialog_parent_class)->constructed (object);
+  gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (self->flow_box), GTK_SELECTION_NONE);
+  gtk_flow_box_set_homogeneous (GTK_FLOW_BOX (self->flow_box), TRUE);
+  gtk_container_set_border_width (GTK_CONTAINER (self->flow_box), 25);
+
+  share_points = photos_base_manager_get_objects (PHOTOS_BASE_MANAGER (self->mngr));
+
+  g_hash_table_iter_init (&iter, share_points);
+  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &share_point))
+    {
+      //create UI for each share point instance.
+      //Still under WIP
+      source = photos_share_point_get_source (share_point);
+      icon = photos_source_get_icon (source);
+
+      grid = gtk_grid_new ();
+      button = gtk_button_new ();
+
+      child = gtk_flow_box_child_new ();
+      gtk_widget_set_halign (child, GTK_ALIGN_START);
+      gtk_container_add (GTK_CONTAINER (child), grid);
+      image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+      //gtk_image_set_pixel_size (GTK_IMAGE (image), 96);
+      name = photos_source_get_name (source);
+      label = gtk_label_new (name);
+      gtk_container_set_border_width (GTK_CONTAINER (child), 10);
+      gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);
+      gtk_button_set_image (GTK_BUTTON (button), image);
+      gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
+      gtk_grid_attach_next_to (GTK_GRID (grid), label, button, GTK_POS_BOTTOM, 1, 1);
+      gtk_container_add (GTK_CONTAINER (self->flow_box), child);
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (photos_share_dialog_button_clicked), share_point);
+    }
+}
+
+
+static void
+photos_share_dialog_dispose (GObject *object)
+{
+  PhotosShareDialog *self = PHOTOS_SHARE_DIALOG (object);
+
+  if (self->cancellable != NULL)
+    g_cancellable_cancel (self->cancellable);
+
+  g_clear_object (&self->cancellable);
+  g_clear_object (&self->item);
+
+  G_OBJECT_CLASS (photos_share_dialog_parent_class)->dispose (object);
+}
+
+
+static void
+photos_share_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+  PhotosShareDialog *self = PHOTOS_SHARE_DIALOG (object);
+
+  switch (prop_id)
+    {
+    case PROP_ITEM:
+      self->item = PHOTOS_BASE_ITEM (g_value_dup_object (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+static void
+photos_share_dialog_init (PhotosShareDialog *self)
+{
+  gtk_widget_init_template (GTK_WIDGET (self));
+
+  self->cancellable = g_cancellable_new ();
+  self->mngr = photos_share_point_manager_dup_singleton();
+}
+
+
+static void
+photos_share_dialog_class_init (PhotosShareDialogClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->constructed = photos_share_dialog_constructed;
+  object_class->dispose = photos_share_dialog_dispose;
+  object_class->set_property = photos_share_dialog_set_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_ITEM,
+                                   g_param_spec_object ("item",
+                                                        "PhotosBaseItem object",
+                                                        "The item to share",
+                                                        PHOTOS_TYPE_BASE_ITEM,
+                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Photos/share-dialog.ui");
+  gtk_widget_class_bind_template_child (widget_class, PhotosShareDialog, flow_box);
+}
+
+GtkWidget *
+photos_share_dialog_new (GtkWindow *parent, PhotosBaseItem *item)
+{
+  g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+  g_return_val_if_fail (PHOTOS_IS_BASE_ITEM (item), NULL);
+
+  return g_object_new (PHOTOS_TYPE_SHARE_DIALOG,
+                       "item", item,
+                       "transient-for", parent,
+                       "use-header-bar", TRUE,
+                       NULL);
+}
diff --git a/src/photos-share-dialog.h b/src/photos-share-dialog.h
new file mode 100644
index 0000000..daf2d7d
--- /dev/null
+++ b/src/photos-share-dialog.h
@@ -0,0 +1,61 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Umang Jain
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef PHOTOS_SHARE_DIALOG_H
+#define PHOTOS_SHARE_DIALOG_H
+
+#include <gtk/gtk.h>
+
+#include "photos-base-item.h"
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_SHARE_DIALOG (photos_share_dialog_get_type ())
+
+#define PHOTOS_SHARE_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   PHOTOS_TYPE_SHARE_DIALOG, PhotosShareDialog))
+
+#define PHOTOS_SHARE_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+   PHOTOS_TYPE_SHARE_DIALOG, PhotosShareDialogClass))
+
+#define PHOTOS_IS_SHARE_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   PHOTOS_TYPE_SHARE_DIALOG))
+
+#define PHOTOS_IS_SHARE_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+   PHOTOS_TYPE_SHARE_DIALOG))
+
+#define PHOTOS_SHARE_DIALOG_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+   PHOTOS_TYPE_SHARE_DIALOG, PhotosShareDialogClass))
+
+typedef struct _PhotosShareDialog      PhotosShareDialog;
+typedef struct _PhotosShareDialogClass PhotosShareDialogClass;
+
+GType               photos_share_dialog_get_type           (void) G_GNUC_CONST;
+
+GtkWidget          *photos_share_dialog_new                (GtkWindow *parent, PhotosBaseItem *item);
+
+G_END_DECLS
+
+#endif /* PHOTOS_SHARE_DIALOG_H */
diff --git a/src/photos-share-dialog.ui b/src/photos-share-dialog.ui
new file mode 100644
index 0000000..6db5ab3
--- /dev/null
+++ b/src/photos-share-dialog.ui
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+    <template class="PhotosShareDialog" parent="GtkDialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes" context="dialog title">Share</property>
+    <property name="modal">1</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">1</property>
+    <property name="resizable">False</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkFlowBox" id="flow_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="cancel_button">
+        <property name="label" translatable="yes">_Cancel</property>
+        <property name="use_underline">1</property>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="cancel">cancel_button</action-widget>
+    </action-widgets>
+</template>
+</interface>
diff --git a/src/photos-share-point.c b/src/photos-share-point.c
index e519f46..50a2e6e 100644
--- a/src/photos-share-point.c
+++ b/src/photos-share-point.c
@@ -207,3 +207,12 @@ photos_share_point_get_source (PhotosSharePoint *self)
   priv = photos_share_point_get_instance_private (self);
   return priv->source;
 }
+
+
+void
+photos_share_point_share (PhotosSharePoint *self, PhotosBaseItem *item)
+{
+  g_return_if_fail (PHOTOS_IS_SHARE_POINT (self));
+
+  PHOTOS_SHARE_POINT_GET_CLASS (self)->share (self, item);
+}
\ No newline at end of file
diff --git a/src/photos-share-point.h b/src/photos-share-point.h
index 75f8e70..547a0eb 100644
--- a/src/photos-share-point.h
+++ b/src/photos-share-point.h
@@ -29,6 +29,7 @@
 #include <goa/goa.h>
 
 #include "photos-source.h"
+#include "photos-base-item.h"
 
 G_BEGIN_DECLS
 
@@ -56,6 +57,7 @@ struct _PhotosSharePointClass
   GObjectClass parent_class;
 
   /* virtual methods */
+  void        (*share)    (PhotosSharePoint *self, PhotosBaseItem *item);
 };
 
 GType                   photos_share_point_get_type               (void) G_GNUC_CONST;
diff --git a/src/photos-source.c b/src/photos-source.c
index cfff373..7e63e6f 100644
--- a/src/photos-source.c
+++ b/src/photos-source.c
@@ -286,3 +286,9 @@ photos_source_get_goa_object (PhotosSource *self)
 {
   return self->object;
 }
+
+GIcon *
+photos_source_get_icon (PhotosSource *self)
+{
+  return self->icon;
+}
\ No newline at end of file
diff --git a/src/photos-source.h b/src/photos-source.h
index d91a22c..a25fbae 100644
--- a/src/photos-source.h
+++ b/src/photos-source.h
@@ -56,6 +56,8 @@ const gchar        *photos_source_get_name               (PhotosSource *self);
 
 GoaObject          *photos_source_get_goa_object         (PhotosSource *self);
 
+GIcon              *photos_source_get_icon               (PhotosSource *self);
+
 G_END_DECLS
 
 #endif /* PHOTOS_SOURCE_H */
