diff --git a/DO_NOT_REMOVE_THIS.txt b/DO_NOT_REMOVE_THIS.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/estate/__init__.py b/estate/__init__.py
new file mode 100644
index 00000000000..0650744f6bc
--- /dev/null
+++ b/estate/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/estate/__manifest__.py b/estate/__manifest__.py
new file mode 100644
index 00000000000..1e1ae43c0d6
--- /dev/null
+++ b/estate/__manifest__.py
@@ -0,0 +1,23 @@
+{
+    'name': "Estate",
+
+    'author': "Odoo",
+    'website': "https://www.odoo.com",
+
+    'category': 'Tutorials',
+    'version': '1.0',
+
+    'depends': ['base', 'web'],
+    'data': [
+        'views/estate_property_offer_view.xml',
+        'views/estate_property_tag_views.xml',
+        'views/estate_property_type_views.xml',
+        'views/estate_property_search_view.xml',
+        'views/estate_property_views.xml',
+        'views/estate_menus.xml',
+        'security/ir.model.access.csv',
+    ],
+    'application': True,
+    'installable': True,
+    'license': 'AGPL-3'
+}
diff --git a/estate/models/__init__.py b/estate/models/__init__.py
new file mode 100644
index 00000000000..ef0cd554275
--- /dev/null
+++ b/estate/models/__init__.py
@@ -0,0 +1,4 @@
+from . import estate
+from . import property_type
+from . import property_tag
+from . import offer
diff --git a/estate/models/estate.py b/estate/models/estate.py
new file mode 100644
index 00000000000..a82d2b0cef3
--- /dev/null
+++ b/estate/models/estate.py
@@ -0,0 +1,103 @@
+from odoo import api, fields, models
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools.float_utils import float_compare, float_is_zero
+
+
+class Estate(models.Model):
+    _name = "estate.property"
+    _description = "Estate Property"
+    _order = "id desc"
+
+    name = fields.Char("Property Name", required=True)
+    description = fields.Text("Description")
+    postcode = fields.Char("Postcode")
+    date_availability = fields.Date("Available From", default=fields.Date.add(fields.Date.today(), months=3))
+    expected_price = fields.Float("Expected Price", required=True)
+    selling_price = fields.Float("Selling Price", readonly=True, copy=False)
+    bedrooms = fields.Integer("Bedrooms", default=2)
+    living_area = fields.Integer("Living Area (sqm)")
+    facades = fields.Integer("Facades")
+    garage = fields.Boolean("Garage", default=True)
+    garden = fields.Boolean("Garden", default=True)
+    garden_area = fields.Integer("Garden Area (sqm)")
+    garden_orientation = fields.Selection(
+        string="Garden Orientation",
+        selection=[
+            ('north', "North"), 
+            ('south', "South"), 
+            ('east', "East"), 
+            ('west', "West")
+        ],
+        required=True)
+    status = fields.Selection(
+        string="Status",
+        selection=[
+            ('new', "New"), 
+            ('offer_received', "Offer Received"), 
+            ('offer_accepted', "Offer Accepted"), 
+            ('sold', "Sold"), 
+            ('canceled', "Canceled")
+        ],
+        default='new',
+        required=True)
+    active = fields.Boolean("Active", default=True)
+    property_type_id = fields.Many2one('estate.property.type', string="Property Type")
+    buyer_id = fields.Many2one('res.partner', string="Buyer", copy=False)
+    salesperson_id = fields.Many2one('res.users', string="Salesperson", default=lambda self: self.env.user)
+    tag_ids = fields.Many2many('estate.property.tag', string="Tags")
+    offer_ids = fields.One2many('estate.property.offer', 'property_id', string="Offers")
+    total_area = fields.Integer("Total Area (sqm)", compute='_compute_total_area')
+    best_price = fields.Float("Best Offer", compute='_compute_best_price')
+
+    _check_expected_price = models.Constraint(
+        "CHECK(expected_price > 0)",
+        "The expected price must be strictly positive"
+    )
+
+    _check_selling_price = models.Constraint(
+        "CHECK(selling_price >= 0)",
+        "The selling price must be positive"
+    )
+    
+    @api.depends('living_area', 'garden_area')
+    def _compute_total_area(self):
+        for record in self:
+            record.total_area = record.living_area + record.garden_area
+
+    @api.depends('offer_ids.price')
+    def _compute_best_price(self):
+        for record in self:
+            record.best_price = max(record.offer_ids.mapped('price')) if record.offer_ids else 0.0  
+
+    @api.onchange('offer_ids')
+    def _onchange_property_status(self):
+        for record in self:
+            if record.status == 'new' and len(record.offer_ids) > 0:
+                record.status = 'offer_received'
+
+    @api.onchange('garden')
+    def _onchange_garden(self):
+        if self.garden:
+            self.garden_area = 10
+            self.garden_orientation = 'north'
+        else:
+            self.garden_area = 0
+            self.garden_orientation = False
+
+    def action_mark_sold(self):
+        for record in self:
+            if record.status == "canceled":
+                raise UserError(self.env._("Canceled properties cannot be sold."))
+            record.status = "sold"
+
+    def action_mark_cancel(self):
+        for record in self:
+            if record.status == "sold":
+                raise UserError(self.env._("Sold properties cannot be canceled."))
+            record.status = "canceled"
+
+    @api.constrains('selling_price')
+    def _check_selling_price(self):
+        for record in self:
+            if not float_is_zero(record.selling_price, precision_digits=2) and float_compare(record.selling_price, record.expected_price * 0.9, precision_digits=2) < 0:
+                    raise ValidationError(self.env._("The selling price must be atleast 90% of the expected price! You must reduce the expected price to accept the offer"))
diff --git a/estate/models/offer.py b/estate/models/offer.py
new file mode 100644
index 00000000000..a9350614a98
--- /dev/null
+++ b/estate/models/offer.py
@@ -0,0 +1,53 @@
+from odoo import api, fields, models
+
+
+class Offer(models.Model):
+    _name = "estate.property.offer"
+    _description = "Estate Property Offer"
+    _order = "price desc"
+
+    price = fields.Float("Offer Price")
+    status = fields.Selection(
+        string="Status",
+        selection=[('accepted', "Accepted"), ('refused', "Refused")],
+        copy=False)
+    partner_id = fields.Many2one('res.partner', string="Partner", required=True)
+    property_id = fields.Many2one('estate.property', string="Property", required=True)
+    validity = fields.Integer('Validity (days)', default=7)
+    date_deadline = fields.Date("Deadline", compute='_compute_date_deadline', inverse="_inverse_date_deadline")
+    property_type_id = fields.Many2one(related='property_id.property_type_id', string="Property Type", store=True, readonly=True)
+
+    _check_price = models.Constraint(
+        "CHECK(price > 0)",
+        "The offer price must be strictly positive"
+    )
+
+    @api.depends('validity', 'create_date')
+    def _compute_date_deadline(self):
+        for record in self:
+            create_date = record.create_date if record.create_date else fields.Date.today()
+            record.date_deadline = fields.Date.add(create_date, days=record.validity)
+
+    def _inverse_date_deadline(self):
+        for record in self:
+            create_date = record.create_date if record.create_date else fields.Date.today()
+            record.validity = (record.date_deadline - create_date.date()).days
+
+    def action_accept_offer(self):
+        for record in self:
+            record.status = "accepted"
+            record.property_id.selling_price = record.price
+            record.property_id.buyer_id = record.partner_id
+            record.property_id.status = "offer_accepted"
+
+            # Reject other offers
+            other_offers = record.property_id.offer_ids.filtered(lambda o: o.id != record.id)
+            other_offers.action_reject_offer()
+
+    def action_reject_offer(self):
+        for record in self:
+            record.status = "refused"
+            if record.property_id.status == "offer_accepted" and record.property_id.buyer_id == record.partner_id:
+                record.property_id.selling_price = 0.0
+                record.property_id.buyer_id = False
+                record.property_id.status = "offer_received"
diff --git a/estate/models/property_tag.py b/estate/models/property_tag.py
new file mode 100644
index 00000000000..47fd44f76a5
--- /dev/null
+++ b/estate/models/property_tag.py
@@ -0,0 +1,15 @@
+from odoo import fields, models
+
+
+class PropertyTag(models.Model):
+    _name = "estate.property.tag"
+    _description = "Estate Property Tag"
+    _order = "name"
+
+    name = fields.Char("Tag Name", required=True)
+    color = fields.Integer("Color")
+
+    _unique_name = models.Constraint(
+        "UNIQUE(name)",
+        "The property tag name must be unique"
+    )
diff --git a/estate/models/property_type.py b/estate/models/property_type.py
new file mode 100644
index 00000000000..54045b2d92f
--- /dev/null
+++ b/estate/models/property_type.py
@@ -0,0 +1,23 @@
+from odoo import api, fields, models
+
+
+class PropertyType(models.Model):
+    _name = "estate.property.type"
+    _description = "Estate Property Type"
+    _order = "sequence, name"
+
+    name = fields.Char("Property Type", required=True)
+    property_ids = fields.One2many('estate.property', 'property_type_id', string="Properties")
+    sequence = fields.Integer("Sequence", default=1, help="Used to order property types")
+    offer_ids = fields.One2many(related='property_ids.offer_ids', string="Offers", readonly=True)
+    offer_count = fields.Integer("Offer Count", compute='_compute_offer_count')
+
+    _unique_name = models.Constraint(
+        "UNIQUE(name)",
+        "The property type name must be unique"
+    )
+
+    @api.depends('offer_ids')
+    def _compute_offer_count(self):
+        for record in self:
+            record.offer_count = len(record.offer_ids)
diff --git a/estate/security/ir.model.access.csv b/estate/security/ir.model.access.csv
new file mode 100644
index 00000000000..839f297bb3c
--- /dev/null
+++ b/estate/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_estate_model,access_estate_model,model_estate_property,base.group_user,1,1,1,1
+access_property_type_model,access_property_type_model,model_estate_property_type,base.group_user,1,1,1,1
+access_property_tag_model,access_property_tag_model,model_estate_property_tag,base.group_user,1,1,1,1
+access_property_offer_model,access_property_offer_model,model_estate_property_offer,base.group_user,1,1,1,1
diff --git a/estate/views/estate_menus.xml b/estate/views/estate_menus.xml
new file mode 100644
index 00000000000..e0a8ba1b98a
--- /dev/null
+++ b/estate/views/estate_menus.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem id="estate_menu_root" name="Estate">
+        <menuitem id="estate_menu_advertisements" name="Advertisements">
+            <menuitem id="estate_menu_properties" name="Properties" action="estate_property_action"/>
+        </menuitem>
+        <menuitem id="estate_menu_settings" name="Settings">
+            <menuitem id="estate_menu_property_types" name="Property Types" action="estate_property_type_action"/>
+            <menuitem id="estate_menu_propert_tags" name="Property Tags" action="estate_property_tag_action"/>
+        </menuitem>
+    </menuitem>
+</odoo>
diff --git a/estate/views/estate_property_offer_view.xml b/estate/views/estate_property_offer_view.xml
new file mode 100644
index 00000000000..3f7c4d0f0d7
--- /dev/null
+++ b/estate/views/estate_property_offer_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="action_estate_property_offer" model="ir.actions.act_window">
+        <field name="name">Offers</field>
+        <field name="res_model">estate.property.offer</field>
+        <field name="view_mode">list,form</field>
+        <field name="domain">[('property_type_id', '=', active_id)]</field>
+    </record>
+
+    <record id="estate_property_offer_view_list" model="ir.ui.view">
+        <field name="name">estate.property.offer.list</field>
+        <field name="model">estate.property.offer</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="price"/>
+                <field name="partner_id"/>
+                <field name="validity"/>
+                <field name="date_deadline"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_search_view.xml b/estate/views/estate_property_search_view.xml
new file mode 100644
index 00000000000..c8f077990e9
--- /dev/null
+++ b/estate/views/estate_property_search_view.xml
@@ -0,0 +1,23 @@
+<odoo>
+    <record id="action_estate_property_search" model="ir.ui.view">
+        <field name="name">estate.property.search</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" string="Title"/>
+                <field name="postcode"/>
+                <field name="expected_price"/>
+                <field name="bedrooms"/>
+                <field name="living_area" filter_domain="[('living_area', '>=', self)]"/>
+                <field name="facades"/>
+                <field name="status"/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                <filter string="Status" name="availability" domain="[('status', 'in', ['new', 'offered'])]"/>
+                <filter string="Available" name="available" domain="[('active', '=', True)]"/>
+                <group>
+                    <filter string="Postcode" name="postcode" context="{'group_by':'postcode'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_tag_views.xml b/estate/views/estate_property_tag_views.xml
new file mode 100644
index 00000000000..b27383d0fe2
--- /dev/null
+++ b/estate/views/estate_property_tag_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="estate_property_tag_action" model="ir.actions.act_window">
+        <field name="name">Property Tags</field>
+        <field name="res_model">estate.property.tag</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <record id="estate_property_tag_view_list" model="ir.ui.view">
+        <field name="name">estate.property.tag.list</field>
+        <field name="model">estate.property.tag</field>
+        <field name="arch" type="xml">
+            <list editable="bottom">
+                <field name="name"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_type_views.xml b/estate/views/estate_property_type_views.xml
new file mode 100644
index 00000000000..6126c5a7305
--- /dev/null
+++ b/estate/views/estate_property_type_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="estate_property_type_action" model="ir.actions.act_window">
+        <field name="name">Property Types</field>
+        <field name="res_model">estate.property.type</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <record id="estate_property_type_view_list" model="ir.ui.view">
+        <field name="name">estate.property.type.list</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="sequence" widget="handle"/>
+                <field name="name" />
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_type_view_form" model="ir.ui.view">
+        <field name="name">estate.property.type.form</field>
+        <field name="model">estate.property.type</field>
+        <field name="arch" type="xml">
+            <form string="Properties List">
+                <button name="%(estate.action_estate_property_offer)d" string="Offers" type="action" class="oe_stat_button" icon="fa-money">
+                    <field name="offer_count" widget="statinfo" string="Offers"/>
+                </button>
+                <sheet>
+                    <notebook>
+                        <page string="Properties">
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                            <field name="property_ids">
+                                <list>
+                                    <field name="name" string="Title"/>
+                                    <field name="expected_price"/>
+                                    <field name="status"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/estate/views/estate_property_views.xml b/estate/views/estate_property_views.xml
new file mode 100644
index 00000000000..1f8d26556b2
--- /dev/null
+++ b/estate/views/estate_property_views.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="estate_property_action" model="ir.actions.act_window">
+        <field name="name">View Records</field>
+        <field name="res_model">estate.property</field>
+        <field name="view_mode">list,form</field>
+        <field name="context">{'search_default_available': True}</field>
+    </record>
+
+    <record id="estate_property_view_list" model="ir.ui.view">
+        <field name="name">estate.property.list</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <list decoration-success="status in ('offer_received', 'offer_accepted')" decoration-bf="status == 'offer_accepted'" decoration-muted="status == 'sold'">
+                <field name="name"/>
+                <field name="postcode"/>
+                <field name="bedrooms"/>
+                <field name="living_area"/>
+                <field name="expected_price"/>
+                <field name="selling_price"/>
+                <field name="date_availability"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="estate_property_view_form" model="ir.ui.view">
+        <field name="name">estate.property.form</field>
+        <field name="model">estate.property</field>
+        <field name="arch" type="xml">
+            <form string="My new house">
+                <header>
+                    <button name="action_mark_sold" type="object" string="Sold" class="oe_highlight" invisible="status == 'sold'"/>
+                    <button name="action_mark_cancel" type="object" string="Cancel" invisible="status == 'sold'"/>
+                    <field name="status" widget="statusbar" statusbar_visible="new, offer_received, offer_accepted, sold"/>
+                </header>
+                <sheet>
+                    <group>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                    </group>
+                    <group>
+                        <field string="Tags" name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" />
+                    </group>
+                    <group>
+                        <group>
+                            <field name="property_type_id" options="{'no_create': true}"/>
+                            <field name="postcode"/>
+                            <field name="date_availability"/>
+                        </group>
+                        <group>
+                            <field name="expected_price"/>
+                            <field name="best_price"/>
+                            <field name="selling_price"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Description">
+                            <group>
+                                <field name="description"/>
+                                <field name="bedrooms"/>
+                                <field name="living_area"/>
+                                <field name="facades"/>
+                                <field name="garage"/>
+                                <field name="garden"/>
+                                <field name="garden_area" invisible="not garden"/>
+                                <field name="garden_orientation" invisible="not garden"/>
+                                <field name="total_area"/>
+                            </group>
+                        </page>
+                        <page string="Offers">
+                            <field name="offer_ids" readonly="status in ('offer_accepted', 'sold', 'canceled')">
+                                <list editable="bottom" decoration-success="status == 'accepted'" decoration-danger="status == 'refused'">
+                                    <field name="price"/>
+                                    <field name="partner_id"/>
+                                    <field name="validity"/>
+                                    <field name="date_deadline"/>
+                                    <button name="action_accept_offer" type="object" icon="fa-check" invisible="status"/>
+                                    <button name="action_reject_offer" type="object" icon="fa-remove" invisible="status"/>
+                                </list>
+                            </field>
+                        </page>
+                        <page string="Other Info">
+                            <group>
+                                <field name="salesperson_id" string="Salesman"/>
+                                <field name="buyer_id" string="Buyer"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+</odoo>