diff --git a/golem_member/__init__.py b/golem_member/__init__.py
new file mode 100644
index 00000000..2fca3d29
--- /dev/null
+++ b/golem_member/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import models
diff --git a/golem_member/__openerp__.py b/golem_member/__openerp__.py
new file mode 100644
index 00000000..405e1b35
--- /dev/null
+++ b/golem_member/__openerp__.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+{
+    'name': 'GOLEM non-profit members',
+    'summary': 'Extends Odoo contacts for MJC',
+    'description': 'Non-profit french MJC members management',
+    'version': '0.1',
+    'category': 'Non-profit management',
+    'author': 'Fabien Bourgeois',
+    'license': 'AGPL-3',
+    'application': True,
+    'installable': True,
+    'depends': ['contacts',
+                'partner_firstname',
+                'partner_contact_birthdate',
+                'partner_contact_gender',
+                'partner_contact_nationality',
+                'membership',
+                'mail',
+                'l10n_fr_state',
+                'l10n_fr_department',
+                'l10n_fr_tax_sale_ttc',
+                'l10n_fr_naf_ape',
+                'l10n_fr_siret',
+                'web_widget_phone_check_fr',
+                'web_widget_email_check',
+                'web_widget_url_check'],
+    'data': ['views/golem_member_view.xml']
+}
diff --git a/golem_member/models/__init__.py b/golem_member/models/__init__.py
new file mode 100644
index 00000000..8d289628
--- /dev/null
+++ b/golem_member/models/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import golem_member
diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
new file mode 100644
index 00000000..4a102893
--- /dev/null
+++ b/golem_member/models/golem_member.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from openerp import models, fields
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    def _get_default_nationality_id(self):
+        return self.env.ref('base.main_company').country_id
+
+    nationality_id = fields.Many2one('res.country', 'Nationality',
+                                     default=_get_default_nationality_id)
+
+    # Gender overwriting : no need for 'other' choice
+    gender = fields.Selection([('male', 'Male'), ('female', 'Female')])
+
+
+class GolemMember(models.Model):
+    """ GOLEM Member """
+    _name = 'golem.member'
+    _inherit = 'mail.thread'
+    _inherits = {'res.partner': 'partner_id'}
+
+    number = fields.Char('Number', size=50)
+    pictures_agreement = fields.Boolean('Pictures agreement?')
diff --git a/golem_member/views/golem_member_view.xml b/golem_member/views/golem_member_view.xml
new file mode 100644
index 00000000..7b72d6bf
--- /dev/null
+++ b/golem_member/views/golem_member_view.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<openerp>
+  <data>
+    <!-- Forms -->
+    <record id="golem_member_view_form" model="ir.ui.view">
+      <field name="name">GOLEM Member Form</field>
+      <field name="model">golem.member</field>
+      <field name="arch" type="xml">
+        <form>
+          <sheet>
+            <div class="oe_title">
+              <h1>
+                <field name="image" widget="image" class="oe_left oe_avatar"
+                  options="{'preview_image': 'image_medium', 'size': [90, 90]}" />
+                <field name="name" class="oe_inline" readonly="True" />
+              </h1>
+            </div>
+            <group string="Personal details">
+              <group>
+                <field name="lastname" required="True" />
+                <field name="firstname" required="True" />
+                <field name="number" />
+              </group>
+              <group>
+                <field name="gender" />
+                <field name="birthdate_date" />
+                <field name="nationality_id" />
+                <field name="function" />
+              </group>
+            </group>
+            <notebook>
+              <page name="contact_details" string="Contact details">
+                <group string="Address">
+                  <group>
+                    <field name="street" placeholder="Street..." />
+                    <field name="street2" />
+                    <field name="zip" placeholder="ZIP" />
+                    <field name="city" placeholder="City" />
+                  </group>
+                  <group>
+                    <field name="state_id" class="oe_no_button"
+                      placeholder="State" />
+                    <field name="country_id" placeholder="Country"
+                      class="oe_no_button" />
+                  </group>
+                </group>
+                <group string="Communication">
+                  <group>
+                    <field name="phone" placeholder="0000000000"
+                      widget="phonefr" />
+                    <field name="mobile" placeholder="0000000000"
+                      widget="phonefr" />
+                    <field name="pictures_agreement"/>
+                  </group>
+                  <group>
+                    <field name="email" widget="email"
+                      placeholder="name@example.org" />
+                    <field name="opt_out" />
+                    <field name="website" widget="url"
+                      placeholder="e.g. www.odoo.com"/>
+                  </group>
+                </group>
+              </page>
+              <page name="other_page" string="Others">
+                <group>
+                  <field name="category_id"
+                    widget="many2many_tags"
+                    placeholder="Tags..."/>
+                  <field name="comment" placeholder="Put an internal note..." />
+                </group>
+              </page>
+            </notebook>
+          </sheet>
+          <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers" />
+              <field name="message_ids" widget="mail_thread" />
+          </div>
+        </form>
+      </field>
+    </record>
+
+    <!-- Trees -->
+    <record model="ir.ui.view" id="golem_member_view_tree">
+      <field name="name">GOLEM Member Tree/List</field>
+      <field name="model">golem.member</field>
+      <field name="arch" type="xml">
+        <tree string="GOLEM Members">
+          <field name="number" />
+          <field name="name" />
+          <field name="contact_address" />
+          <field name="phone" />
+          <field name="mobile" />
+          <field name="email" widget="email" />
+        </tree>
+      </field>
+    </record>
+
+    <!-- Searches -->
+    <record id="golem_member_view_filter" model="ir.ui.view">
+      <field name="name">GOLEM Member Filters</field>
+      <field name="model">golem.member</field>
+      <field name="arch" type="xml">
+        <search>
+          <filter name="group_city" string="By city"
+            context="{'group_by': 'city'}"/>
+        </search>
+      </field>
+    </record>
+
+    <!-- Graphs -->
+    <record model="ir.ui.view" id="view_graph_golem_member">
+      <field name="name">GOLEM Member Graph</field>
+      <field name="model">golem.member</field>
+      <field name="arch" type="xml">
+        <graph string="GOLEM Members" type="pivot">
+          <field name="partner_id" />
+        </graph>
+      </field>
+    </record>
+
+    <!-- Actions -->
+    <act_window id="golem_member_action"
+      name="GOLEM Members"
+      res_model="golem.member"
+      view_mode="kanban,tree,form,graph" />
+    <record model="ir.actions.act_window.view"
+      id="golem_member_view_kanban">
+      <field name="view_mode">kanban</field>
+      <field name="view_id" ref="base.res_partner_kanban_view"/>
+      <field name="act_window_id" ref="golem_member_action"/>
+    </record>
+
+    <!-- Menu items -->
+    <menuitem id="menu_golem_members"
+      name="GOLEM Members"
+      parent="membership.menu_membership"
+      sequence="5"
+      action="golem_member_action" />
+  </data>
+</openerp>