diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 78c5c7444..928f06edd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -49,6 +49,7 @@
 //= require fixed_bar
 //= require banners
 //= require social_share
+//= require checkbox_toggle
 //= require custom
 
 var initialize_modules = function() {
@@ -74,6 +75,7 @@ var initialize_modules = function() {
   App.FixedBar.initialize();
   App.Banners.initialize();
   App.SocialShare.initialize();
+  App.CheckboxToggle.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/checkbox_toggle.js.coffee b/app/assets/javascripts/checkbox_toggle.js.coffee
new file mode 100644
index 000000000..096ce7e25
--- /dev/null
+++ b/app/assets/javascripts/checkbox_toggle.js.coffee
@@ -0,0 +1,12 @@
+App.CheckboxToggle =
+
+  initialize: ->
+    $('[data-checkbox-toggle]').on 'change', ->
+      $this = $(this)
+      $target = $($this.data('checkbox-toggle'))
+      if $this.is(':checked')
+        $target.show()
+      else
+        $target.hide()
+
+
diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index cc5bf015e..b804d62ba 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -80,6 +80,7 @@ $budget:            #7E328A;
 $budget-hover:      #7571BF;
 
 $highlight:         #E7F2FC;
+$light:             #F5F7FA;
 $featured:          #FFDC5C;
 
 $footer-border:     #BFC1C3;
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index 252cef324..fac6d35ed 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -5,6 +5,7 @@
 // 03. List elements
 // 04. Stats
 // 05. Management
+// 06. Polls
 //
 
 // 01. Global styles
@@ -20,6 +21,11 @@ body.admin {
     .top-links {
       background: darken($admin-color, 15%);
     }
+
+    .back-web {
+      padding-top: $line-height/4;
+      text-decoration: underline;
+    }
   }
 
   .top-bar {
@@ -27,19 +33,37 @@ body.admin {
     height: auto;
   }
 
+  .top-bar-title {
+
+    h1 {
+      margin-bottom: 0;
+    }
+  }
+
   form {
 
     .button {
       margin-top: 0;
+
+      &.margin-top {
+        margin-top: $line-height;
+      }
     }
 
     input[type="text"], textarea {
       width: 100%;
     }
 
-    .input-group input[type="text"] {
-      border-radius: 0;
-      margin-bottom: 0 !important;
+    .fieldset {
+
+      select {
+        height: $line-height*2;
+      }
+
+      .input-group input[type="text"] {
+        border-radius: 0;
+        margin-bottom: 0 !important;
+      }
     }
   }
 
@@ -48,6 +72,15 @@ body.admin {
     th {
       text-align: left;
 
+      &.text-center {
+        text-align: center;
+      }
+
+      &.text-right {
+        padding-right: $line-height;
+        text-align: right;
+      }
+
       &.with-button {
         line-height: $line-height*2;
       }
@@ -62,9 +95,20 @@ body.admin {
       }
     }
 
+    &.fixed {
+      table-layout: fixed;
+    }
+
     input[type="submit"] ~ a, a ~ a {
-      margin-left: $line-height/2;
-      margin-right: $line-height/2;
+      margin-left: 0;
+      margin-right: 0;
+      margin-top: $line-height/2;
+
+      @include breakpoint(medium) {
+        margin-left: $line-height/2;
+        margin-right: $line-height/2;
+        margin-top: 0;
+      }
     }
   }
 
@@ -77,6 +121,11 @@ body.admin {
     color: $admin-color;
   }
 
+  .tabs-panel {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   #proposals {
     width: 100% !important;
   }
@@ -148,6 +197,13 @@ body.admin {
   }
 }
 
+.input-group {
+
+  .input-group-button {
+    padding-bottom: rem-calc(16);
+  }
+}
+
 // 02. Sidebar
 // -----------
 
@@ -155,7 +211,7 @@ body.admin {
   border-right: 1px solid $border;
 
   @include breakpoint(medium) {
-    padding-bottom: $line-height*3;
+    min-height: rem-calc(1100);
   }
 
   ul {
@@ -165,10 +221,12 @@ body.admin {
     padding: 0;
 
     [class^="icon-"] {
+      color: $admin-color;
       display: inline-block;
       font-size: rem-calc(24);
-      padding-right: rem-calc(12);
-      padding-top: rem-calc(4);
+      line-height: $line-height;
+      padding: $line-height/2 $line-height/4;
+      padding-left: 0;
       vertical-align: middle;
     }
 
@@ -177,19 +235,26 @@ body.admin {
       margin: 0;
       outline: 0;
 
+      ul {
+        margin-left: $line-height/1.5;
+        border-left: 1px solid $border;
+        padding-left: $line-height/2;
+      }
+
+      &.section-title {
+        border-bottom: 1px solid $border;
+      }
+
       &.active a {
         background: #f3f6f7;
+        border-radius: rem-calc(6);
+        -moz-border-radius: rem-calc(6);
+        -webkit-border-radius: rem-calc(6);
         color: $admin-color;
         font-weight: bold;
       }
     }
 
-    li.section {
-      border-bottom: 1px dotted #d5d5d5;
-      border-top: 1px dotted #d5d5d5;
-      height: $line-height/2;
-    }
-
     li a {
       color: $text;
       display: block;
@@ -199,10 +264,38 @@ body.admin {
 
       &:hover {
         background: #f3f6f7;
+        border-radius: rem-calc(6);
+        -moz-border-radius: rem-calc(6);
+        -webkit-border-radius: rem-calc(6);
+        color: $admin-color;
         text-decoration: none;
       }
     }
   }
+
+  .is-accordion-submenu-parent {
+
+    & > a::after {
+      border-color: $admin-color transparent transparent;
+    }
+  }
+
+  .submenu {
+    border-bottom: 0;
+    margin-left: $line-height;
+
+    li:first-child {
+      padding-top: $line-height/2;
+    }
+
+    li:last-child {
+      padding-bottom: $line-height/2;
+    }
+
+    a {
+      font-weight: normal;
+    }
+  }
 }
 
 // 03. List elements
@@ -404,10 +497,43 @@ table.investment-projects-summary {
   }
 }
 
-// 05. CMS
+.geozone {
+  background: #ececec;
+  border-radius: rem-calc(6);
+  color: $text;
+  display: inline-block;
+  font-size: $small-font-size;
+  margin-bottom: $line-height/3;
+  padding: $line-height/4 $line-height/3;
+  text-decoration: none;
+
+  &:hover {
+    background: #e0e0e0;
+  }
+}
+
+// 06. Polls
+// -----------------
+
+.count-error {
+  background: $alert-bg !important;
+  color: $color-alert;
+  font-weight: bold;
+}
+
+table {
+
+  .callout {
+    height: $line-height*2;
+    line-height: $line-height*2;
+    padding: 0 $line-height/2;
+  }
+}
+
+// 07. CMS
 // --------------
 .cms_page_list {
-  
+
   [class^="icon-"] {
     padding-right: $menu-icon-spacing;
     vertical-align: middle;
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index c02835881..afbcc8bdd 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -163,6 +163,12 @@
 .icon-whatsapp:before {
   content: "\50";
 }
+.icon-zip:before {
+  content: "\4f";
+}
+.icon-banner:before {
+  content: "\51";
+}
 .icon-arrow-down:before {
   content: "\52";
 }
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 45a131763..94d403528 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -144,6 +144,10 @@ a {
   padding-top: $line-height;
 }
 
+.light {
+  background: $light;
+}
+
 .highlight {
   background: $highlight;
 }
@@ -204,6 +208,30 @@ a {
   }
 }
 
+.menu.vertical {
+  background: white;
+  margin: $line-height 0;
+  padding: $line-height;
+
+  li {
+    margin-bottom: $line-height;
+
+    a {
+      color: $text-medium;
+      padding: 0;
+    }
+
+    h2 {
+      font-size: $base-font-size;
+    }
+
+    &.active {
+      border-bottom: 2px solid $brand;
+      color: $brand;
+    }
+  }
+}
+
 .small {
   font-size: $small-font-size;
 }
@@ -462,6 +490,7 @@ header {
 
   .input-group-button {
     line-height: $line-height*1.5;
+    padding-bottom: 0;
 
     button {
       background: $border;
@@ -483,7 +512,6 @@ header {
 }
 
 .submenu {
-  background: white;
   border-bottom: 1px solid $border;
   clear: both;
   margin-bottom: $line-height/2;
@@ -585,7 +613,8 @@ footer {
 // 04. Tags
 // --------
 
-.tags a , .tag-cloud a, .categories a, .geozone a, .sidebar-links a {
+.tags a , .tag-cloud a, .categories a, .geozone a, .sidebar-links a,
+.tags span {
   background: #ececec;
   border-radius: rem-calc(6);
   color: $text;
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index feca7f0a8..ad413925b 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -6,7 +6,8 @@
 // 04. List participation
 // 05. Featured
 // 06. Budget
-// 07. Proposals successfull
+// 07. Proposals successful
+// 08. Polls
 //
 
 // 01. Votes and supports
@@ -297,7 +298,8 @@
 .debate-show,
 .proposal-show,
 .investment-project-show,
-.budget-investment-show {
+.budget-investment-show,
+.polls-show {
 
   p {
     word-wrap: break-word;
@@ -769,7 +771,7 @@
 // ------------
 
 .featured-debates, .featured-proposals,
-.proposals-ballot, .proposals-ballot-list {
+.enquiries-list {
   padding: $line-height/2 0;
 
   @include breakpoint(medium) {
@@ -1206,7 +1208,7 @@ ul.ballot-list {
   }
 }
 
-// 07. Proposals successfull
+// 07. Proposals successful
 // -------------------------
 
 .dark-heading {
@@ -1239,7 +1241,7 @@ ul.ballot-list {
   }
 }
 
-.featured-proposals-ballot-banner {
+.featured-proposals-ballot-banner, .sucessfull-proposals-banner {
   background: #2D3E50 image-url("ballot_tiny.gif") no-repeat;
   background-position: 75% 0;
   position: relative;
@@ -1263,10 +1265,10 @@ ul.ballot-list {
   }
 }
 
-.featured-proposals-ballot-banner,
-.successfull .panel {
+.sucessfull-proposals-banner,
+.successful .panel {
 
-  .icon-successfull {
+  .icon-successful {
     border-right: 60px solid #FFD200;
     border-top: 0;
     border-bottom: 60px solid transparent;
@@ -1287,17 +1289,7 @@ ul.ballot-list {
   }
 }
 
-.proposals-ballot-list {
-
-  .proposal-sucessfull {
-    background: white;
-    border-top: 1px solid $border;
-    padding: $line-height 0;
-    position: relative;
-  }
-}
-
-.successfull {
+.successful {
 
   .panel {
     position: relative;
@@ -1318,3 +1310,199 @@ ul.ballot-list {
     }
   }
 }
+
+// 08. Polls
+// ----------------------
+
+.dark-heading {
+  background: #2D3E50;
+  color: white;
+
+  .title {
+    color: #92BA48;
+  }
+
+  .button {
+    background: white;
+    color: $brand;
+  }
+
+  .callout {
+
+    &.warning a {
+      color: $color-warning;
+    }
+
+    &.primary a {
+      color: $color-info;
+    }
+
+    &.alert a {
+      color: $color-alert;
+    }
+  }
+
+  .info {
+    background: #314253;
+    padding: $line-height;
+
+    @include breakpoint(medium) {
+      border-top: rem-calc(6) solid #92BA48;
+    }
+  }
+
+  a:not(.button) {
+    color: white;
+    text-decoration: underline;
+  }
+
+  .back, .icon-angle-left {
+    color: white;
+  }
+
+  &.polls-show-header {
+    min-height: $line-height*8;
+  }
+}
+
+.poll, .poll-question {
+  background: white;
+  border-radius: rem-calc(6);
+  margin-bottom: $line-height/2;
+}
+
+.poll {
+  padding: $line-height;
+  position: relative;
+
+  .icon-poll-answer {
+    border-top: 0;
+    border-bottom: 60px solid transparent;
+    height: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 0;
+
+    &.can-answer:after,
+    &.cant-answer:after,
+    &.not-logged-in:after,
+    &.already-answer:after,
+    &.unverified:after {
+      font-family: "icons" !important;
+      left: 34px;
+      position: absolute;
+      top: 5px;
+    }
+
+    &.can-answer {
+      border-right: 60px solid $info-bg;
+
+      &:after {
+        color: $color-info;
+        content: "\6c";
+      }
+    }
+
+    &.cant-answer {
+      border-right: 60px solid $alert-bg;
+
+      &:after {
+        color: $color-alert;
+        content: "\74";
+      }
+    }
+
+    &.not-logged-in {
+      border-right: 60px solid $info-bg;
+
+      &:after {
+        color: $color-info;
+        content: "\6f";
+      }
+    }
+
+    &.unverified {
+      border-right: 60px solid $warning-bg;
+
+      &:after {
+        color: $color-warning;
+        content: "\6f";
+      }
+    }
+
+    &.already-answer {
+      border-right: 60px solid $success-bg;
+
+      &:after {
+        color: $color-success;
+        content: "\59";
+      }
+    }
+  }
+
+  .dates {
+    color: $text-medium;
+    font-size: $small-font-size;
+    margin-bottom: $line-height/2;
+  }
+
+  h4 {
+    font-size: rem-calc(30);
+    line-height: $line-height*1.5;
+
+    a {
+      color: $text;
+    }
+  }
+}
+
+h2.questions-callout {
+  font-size: $base-font-size;
+}
+
+h3.section-title-divider {
+  border-bottom: 2px solid $brand;
+  color: $brand;
+  margin-bottom: $line-height;
+}
+
+.poll-question {
+  padding: 0 $line-height;
+
+  h3 {
+    padding-top: $line-height;
+
+    a {
+      color: $text;
+    }
+  }
+}
+
+.poll-question-answers {
+
+  .button {
+    margin-right: $line-height/4;
+    min-width: rem-calc(168);
+
+    &.answered {
+      background: #F4F8EC;
+      border: 2px solid #92BA48;
+      color: $text;
+      position: relative;
+
+      &:after {
+        background: #92BA48;
+        border-radius: rem-calc(20);
+        content: "\6c";
+        color: white;
+        font-family: "icons" !important;
+        font-size: rem-calc(12);
+        padding: $line-height/4;
+        position: absolute;
+        right: -6px;
+        top: -6px;
+      }
+    }
+  }
+}
diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb
new file mode 100644
index 000000000..f81382bf8
--- /dev/null
+++ b/app/controllers/admin/poll/booth_assignments_controller.rb
@@ -0,0 +1,66 @@
+class Admin::Poll::BoothAssignmentsController < Admin::BaseController
+
+  before_action :load_poll, except: [:create, :destroy]
+
+  def index
+    @booth_assignments = @poll.booth_assignments.includes(:booth).order('poll_booths.name').page(params[:page]).per(50)
+  end
+
+  def search_booths
+    load_search
+    @booths = ::Poll::Booth.search(@search)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def show
+    @booth_assignment = @poll.booth_assignments.includes(:recounts, :final_recounts, :voters, officer_assignments: [officer: [:user]]).find(params[:id])
+    @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date}
+  end
+
+  def create
+    @booth_assignment = ::Poll::BoothAssignment.new(poll_id: booth_assignment_params[:poll_id], booth_id: booth_assignment_params[:booth_id])
+
+    if @booth_assignment.save
+      notice = t("admin.poll_booth_assignments.flash.create")
+    else
+      notice = t("admin.poll_booth_assignments.flash.error_create")
+    end
+    redirect_to admin_poll_booth_assignments_path(@booth_assignment.poll_id), notice: notice
+  end
+
+  def destroy
+    @booth_assignment = ::Poll::BoothAssignment.find(params[:id])
+
+    if @booth_assignment.destroy
+      notice = t("admin.poll_booth_assignments.flash.destroy")
+    else
+      notice = t("admin.poll_booth_assignments.flash.error_destroy")
+    end
+    redirect_to admin_poll_booth_assignments_path(@booth_assignment.poll_id), notice: notice
+  end
+
+  private
+
+    def load_booth_assignment
+      @booth_assignment = ::Poll::BoothAssignment.find(params[:id])
+    end
+
+    def booth_assignment_params
+      params.permit(:booth_id, :poll_id)
+    end
+
+    def load_poll
+      @poll = ::Poll.find(params[:poll_id])
+    end
+
+    def search_params
+      params.permit(:poll_id, :search)
+    end
+
+    def load_search
+      @search = search_params[:search]
+    end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/poll/booths_controller.rb b/app/controllers/admin/poll/booths_controller.rb
new file mode 100644
index 000000000..ff3700436
--- /dev/null
+++ b/app/controllers/admin/poll/booths_controller.rb
@@ -0,0 +1,39 @@
+class Admin::Poll::BoothsController < Admin::BaseController
+  load_and_authorize_resource class: 'Poll::Booth'
+
+  def index
+    @booths = @booths.order(name: :asc).page(params[:page])
+  end
+
+  def show
+  end
+
+  def new
+  end
+
+  def create
+    if @booth.save
+      redirect_to admin_booths_path, notice: t("flash.actions.create.poll_booth")
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @booth.update(booth_params)
+      redirect_to admin_booth_path(@booth), notice: t("flash.actions.update.poll_booth")
+    else
+      render :edit
+    end
+  end
+
+  private
+
+    def booth_params
+      params.require(:poll_booth).permit(:name, :location)
+    end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb
new file mode 100644
index 000000000..f37ef9ab8
--- /dev/null
+++ b/app/controllers/admin/poll/officer_assignments_controller.rb
@@ -0,0 +1,92 @@
+class Admin::Poll::OfficerAssignmentsController < Admin::BaseController
+
+  before_action :load_poll
+  before_action :redirect_if_blank_required_params, only: [:by_officer]
+  before_action :load_booth_assignment, only: [:create]
+
+  def index
+    @officers = ::Poll::Officer.
+                  includes(:user).
+                  order('users.username').
+                  where(
+                    id: @poll.officer_assignments.select(:officer_id).distinct.map(&:officer_id)
+                  ).page(params[:page]).per(50)
+  end
+
+  def by_officer
+    @poll = ::Poll.includes(:booths).find(params[:poll_id])
+    @officer = ::Poll::Officer.includes(:user).find(officer_assignment_params[:officer_id])
+    @officer_assignments = ::Poll::OfficerAssignment.
+                           joins(:booth_assignment).
+                           includes(:recount, :final_recounts, booth_assignment: :booth).
+                           where("officer_id = ? AND poll_booth_assignments.poll_id = ?", @officer.id, @poll.id).
+                           order(:date)
+  end
+
+  def search_officers
+    load_search
+    @officers = User.joins(:poll_officer).search(@search).order(username: :asc)
+
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def create
+    @officer_assignment = ::Poll::OfficerAssignment.new(booth_assignment: @booth_assignment,
+                                                        officer_id: create_params[:officer_id],
+                                                        date: create_params[:date])
+    @officer_assignment.final = true if @officer_assignment.date > @booth_assignment.poll.ends_at.to_date
+
+    if @officer_assignment.save
+      notice = t("admin.poll_officer_assignments.flash.create")
+    else
+      notice = t("admin.poll_officer_assignments.flash.error_create")
+    end
+    redirect_to by_officer_admin_poll_officer_assignments_path(poll_id: create_params[:poll_id], officer_id: create_params[:officer_id]), notice: notice
+  end
+
+  def destroy
+    @officer_assignment = ::Poll::OfficerAssignment.includes(:booth_assignment).find(params[:id])
+
+    if @officer_assignment.destroy
+      notice = t("admin.poll_officer_assignments.flash.destroy")
+    else
+      notice = t("admin.poll_officer_assignments.flash.error_destroy")
+    end
+    redirect_to by_officer_admin_poll_officer_assignments_path(poll_id: @officer_assignment.poll_id, officer_id: @officer_assignment.officer_id), notice: notice
+  end
+
+  private
+
+    def officer_assignment_params
+      params.permit(:officer_id)
+    end
+
+    def create_params
+      params.permit(:poll_id, :booth_id, :date, :officer_id)
+    end
+
+    def load_booth_assignment
+      @booth_assignment = ::Poll::BoothAssignment.includes(:poll).find_by(poll_id: create_params[:poll_id], booth_id: create_params[:booth_id])
+    end
+
+    def load_poll
+      @poll = ::Poll.find(params[:poll_id])
+    end
+
+    def redirect_if_blank_required_params
+      if officer_assignment_params[:officer_id].blank?
+        redirect_to admin_poll_path(@poll)
+      end
+    end
+
+    def search_params
+      params.permit(:poll_id, :search)
+    end
+
+    def load_search
+      @search = search_params[:search]
+    end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/poll/officers_controller.rb b/app/controllers/admin/poll/officers_controller.rb
new file mode 100644
index 000000000..2641a12b5
--- /dev/null
+++ b/app/controllers/admin/poll/officers_controller.rb
@@ -0,0 +1,39 @@
+class Admin::Poll::OfficersController < Admin::BaseController
+  load_and_authorize_resource :officer, class: "Poll::Officer", except: [:edit, :show]
+
+  def index
+    @officers = @officers.page(params[:page])
+  end
+
+  def search
+    @user = User.find_by(email: params[:email])
+
+    respond_to do |format|
+      if @user
+        @officer = Poll::Officer.find_or_initialize_by(user: @user)
+        format.js
+      else
+        format.js { render "user_not_found" }
+      end
+    end
+  end
+
+  def create
+    @officer.user_id = params[:user_id]
+    @officer.save
+
+    redirect_to admin_officers_path
+  end
+
+  def destroy
+    @officer.destroy
+    redirect_to admin_officers_path
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb
new file mode 100644
index 000000000..eda5736b0
--- /dev/null
+++ b/app/controllers/admin/poll/polls_controller.rb
@@ -0,0 +1,86 @@
+class Admin::Poll::PollsController < Admin::BaseController
+  load_and_authorize_resource
+
+  before_action :load_search, only: [:search_booths, :search_questions, :search_officers]
+  before_action :load_geozones, only: [:new, :create, :edit, :update]
+
+  def index
+  end
+
+  def show
+    @poll = Poll.includes(:questions).
+                          order('poll_questions.title').
+                          find(params[:id])
+  end
+
+  def new
+  end
+
+  def create
+    if @poll.save
+      redirect_to [:admin, @poll], notice: t("flash.actions.create.poll")
+    else
+      render :new
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @poll.update(poll_params)
+      redirect_to [:admin, @poll], notice: t("flash.actions.update.poll")
+    else
+      render :edit
+    end
+  end
+
+  def add_question
+    question = ::Poll::Question.find(params[:question_id])
+
+    if question.present?
+      @poll.questions << question
+      notice = t("admin.polls.flash.question_added")
+    else
+      notice = t("admin.polls.flash.error_on_question_added")
+    end
+    redirect_to admin_poll_path(@poll), notice: notice
+  end
+
+  def remove_question
+    question = ::Poll::Question.find(params[:question_id])
+
+    if @poll.questions.include? question
+      @poll.questions.delete(question)
+      notice = t("admin.polls.flash.question_removed")
+    else
+      notice = t("admin.polls.flash.error_on_question_removed")
+    end
+    redirect_to admin_poll_path(@poll), notice: notice
+  end
+
+  def search_questions
+    @questions = ::Poll::Question.where("poll_id IS ? OR poll_id != ?", nil, @poll.id).search({search: @search}).order(title: :asc)
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+    def load_geozones
+      @geozones = Geozone.all.order(:name)
+    end
+
+    def poll_params
+      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, geozone_ids: [])
+    end
+
+    def search_params
+      params.permit(:poll_id, :search)
+    end
+
+    def load_search
+      @search = search_params[:search]
+    end
+
+end
diff --git a/app/controllers/admin/poll/questions_controller.rb b/app/controllers/admin/poll/questions_controller.rb
new file mode 100644
index 000000000..ab7297a95
--- /dev/null
+++ b/app/controllers/admin/poll/questions_controller.rb
@@ -0,0 +1,64 @@
+class Admin::Poll::QuestionsController < Admin::BaseController
+  load_and_authorize_resource :poll
+  load_and_authorize_resource :question, class: 'Poll::Question'
+
+  def index
+    @polls = Poll.all
+    @search = search_params[:search]
+
+    @questions = @questions.search(search_params).page(params[:page]).order("created_at DESC")
+
+    @proposals = Proposal.successful.sort_by_confidence_score
+  end
+
+  def new
+    @polls = Poll.all
+    @question.valid_answers = I18n.t('poll_questions.default_valid_answers')
+    proposal = Proposal.find(params[:proposal_id]) if params[:proposal_id].present?
+    @question.copy_attributes_from_proposal(proposal)
+  end
+
+  def create
+    @question.author = @question.proposal.try(:author) || current_user
+
+    if @question.save
+      redirect_to admin_question_path(@question)
+    else
+      render :new
+    end
+  end
+
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @question.update(question_params)
+      redirect_to admin_question_path(@question), notice: t("flash.actions.save_changes.notice")
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    if @question.destroy
+      notice = "Question destroyed succesfully"
+    else
+      notice = t("flash.actions.destroy.error")
+    end
+    redirect_to admin_questions_path, notice: notice
+  end
+
+  private
+
+    def question_params
+      params.require(:poll_question).permit(:poll_id, :title, :question, :description, :proposal_id, :valid_answers)
+    end
+
+    def search_params
+      params.permit(:poll_id, :search)
+    end
+
+end
diff --git a/app/controllers/admin/poll/recounts_controller.rb b/app/controllers/admin/poll/recounts_controller.rb
new file mode 100644
index 000000000..fec546d79
--- /dev/null
+++ b/app/controllers/admin/poll/recounts_controller.rb
@@ -0,0 +1,16 @@
+class Admin::Poll::RecountsController < Admin::BaseController
+  before_action :load_poll
+
+  def index
+    @booth_assignments = @poll.booth_assignments.
+                              includes(:booth, :recounts, :final_recounts, :voters).
+                              order("poll_booths.name").
+                              page(params[:page]).per(50)
+  end
+
+  private
+
+    def load_poll
+      @poll = ::Poll.find(params[:poll_id])
+    end
+end
\ No newline at end of file
diff --git a/app/controllers/admin/poll/results_controller.rb b/app/controllers/admin/poll/results_controller.rb
new file mode 100644
index 000000000..2c5bbba27
--- /dev/null
+++ b/app/controllers/admin/poll/results_controller.rb
@@ -0,0 +1,13 @@
+class Admin::Poll::ResultsController < Admin::BaseController
+  before_action :load_poll
+
+  def index
+    @partial_results = @poll.partial_results
+  end
+
+  private
+
+    def load_poll
+      @poll = ::Poll.includes(:questions).find(params[:poll_id])
+    end
+end
\ No newline at end of file
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 8262f014a..6d17eb749 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -22,7 +22,7 @@ class DebatesController < ApplicationController
 
   def index_customization
     @featured_debates = @debates.featured
-    @proposal_successfull_exists = Proposal.successfull.exists?
+    @proposal_successfull_exists = Proposal.successful.exists?
   end
 
   def show
diff --git a/app/controllers/officing/base_controller.rb b/app/controllers/officing/base_controller.rb
new file mode 100644
index 000000000..97ef23d30
--- /dev/null
+++ b/app/controllers/officing/base_controller.rb
@@ -0,0 +1,12 @@
+class Officing::BaseController < ApplicationController
+  layout 'admin'
+
+  before_action :authenticate_user!
+  before_action :verify_officer
+
+  skip_authorization_check
+
+  def verify_officer
+    raise CanCan::AccessDenied unless current_user.try(:poll_officer?) || current_user.try(:administrator?)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/officing/dashboard_controller.rb b/app/controllers/officing/dashboard_controller.rb
new file mode 100644
index 000000000..4d80a974a
--- /dev/null
+++ b/app/controllers/officing/dashboard_controller.rb
@@ -0,0 +1,6 @@
+class Officing::DashboardController < Officing::BaseController
+
+  def index
+  end
+
+end
diff --git a/app/controllers/officing/final_recounts_controller.rb b/app/controllers/officing/final_recounts_controller.rb
new file mode 100644
index 000000000..e381240e7
--- /dev/null
+++ b/app/controllers/officing/final_recounts_controller.rb
@@ -0,0 +1,47 @@
+class Officing::FinalRecountsController < Officing::BaseController
+  before_action :load_poll
+  before_action :load_officer_assignment, only: :create
+
+  def new
+    @officer_assignments = ::Poll::OfficerAssignment.
+                  includes(:final_recounts, booth_assignment: [:booth]).
+                  joins(:booth_assignment).
+                  final.
+                  where(id: current_user.poll_officer.officer_assignment_ids).
+                  where("poll_booth_assignments.poll_id = ?", @poll.id).
+                  order(date: :asc)
+
+    @final_recounts = @officer_assignments.select {|oa| oa.final_recounts.any?}.map(&:final_recounts).flatten
+  end
+
+  def create
+    @final_recount = ::Poll::FinalRecount.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, date: final_recount_params[:date])
+    @final_recount.officer_assignment_id = @officer_assignment.id
+    @final_recount.count = final_recount_params[:count]
+
+    if @final_recount.save
+      msg = { notice: t("officing.final_recounts.flash.create") }
+    else
+      msg = { alert: t("officing.final_recounts.flash.error_create") }
+    end
+    redirect_to new_officing_poll_final_recount_path(@poll), msg
+  end
+
+  private
+    def load_poll
+      @poll = Poll.expired.find(params[:poll_id])
+    end
+
+    def load_officer_assignment
+      @officer_assignment = current_user.poll_officer.
+                            officer_assignments.final.find_by(id: final_recount_params[:officer_assignment_id])
+      if @officer_assignment.blank?
+        redirect_to new_officing_poll_final_recount_path(@poll), alert: t("officing.final_recounts.flash.error_create")
+      end
+    end
+
+    def final_recount_params
+      params.permit(:officer_assignment_id, :count, :date)
+    end
+
+end
\ No newline at end of file
diff --git a/app/controllers/officing/polls_controller.rb b/app/controllers/officing/polls_controller.rb
new file mode 100644
index 000000000..e122284ec
--- /dev/null
+++ b/app/controllers/officing/polls_controller.rb
@@ -0,0 +1,15 @@
+class Officing::PollsController < Officing::BaseController
+
+  def index
+    @polls = current_user.poll_officer? ? current_user.poll_officer.voting_days_assigned_polls : []
+    @polls = @polls.select {|poll| poll.current?(Time.current) || poll.current?(1.day.ago)}
+  end
+
+  def final
+    @polls = current_user.poll_officer? ? current_user.poll_officer.final_days_assigned_polls : []
+    return unless current_user.poll_officer?
+
+    @polls = @polls.select {|poll| poll.ends_at > 1.week.ago && poll.expired?}
+  end
+
+end
\ No newline at end of file
diff --git a/app/controllers/officing/recounts_controller.rb b/app/controllers/officing/recounts_controller.rb
new file mode 100644
index 000000000..1c66e57fd
--- /dev/null
+++ b/app/controllers/officing/recounts_controller.rb
@@ -0,0 +1,46 @@
+class Officing::RecountsController < Officing::BaseController
+  before_action :load_poll
+  before_action :load_officer_assignment, only: :create
+
+  def new
+    @officer_assignments = ::Poll::OfficerAssignment.
+                  includes(:recount, booth_assignment: :booth).
+                  joins(:booth_assignment).
+                  voting_days.
+                  where(id: current_user.poll_officer.officer_assignment_ids).
+                  where("poll_booth_assignments.poll_id = ?", @poll.id).
+                  order(date: :asc)
+    @recounted = @officer_assignments.select {|oa| oa.recount.present?}.reverse
+  end
+
+  def create
+    @recount = ::Poll::Recount.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id, date: @officer_assignment.date)
+    @recount.officer_assignment_id = @officer_assignment.id
+    @recount.count = recount_params[:count]
+
+    if @recount.save
+      msg = { notice: t("officing.recounts.flash.create") }
+    else
+      msg = { alert: t("officing.recounts.flash.error_create") }
+    end
+    redirect_to new_officing_poll_recount_path(@poll), msg
+  end
+
+  private
+    def load_poll
+      @poll = Poll.find(params[:poll_id])
+    end
+
+    def load_officer_assignment
+      @officer_assignment = current_user.poll_officer.
+                            officer_assignments.find_by(id: recount_params[:officer_assignment_id])
+      if @officer_assignment.blank?
+        redirect_to new_officing_poll_recount_path(@poll), alert: t("officing.recounts.flash.error_create")
+      end
+    end
+
+    def recount_params
+      params.permit(:officer_assignment_id, :count)
+    end
+
+end
\ No newline at end of file
diff --git a/app/controllers/officing/residence_controller.rb b/app/controllers/officing/residence_controller.rb
new file mode 100644
index 000000000..9f24d3a90
--- /dev/null
+++ b/app/controllers/officing/residence_controller.rb
@@ -0,0 +1,37 @@
+class Officing::ResidenceController < Officing::BaseController
+
+  before_action :load_officer_assignment
+  before_action :validate_officer_assignment, only: :create
+
+  def new
+    @residence = Officing::Residence.new
+  end
+
+  def create
+    @residence = Officing::Residence.new(residence_params.merge(officer: current_user.poll_officer))
+    if @residence.save
+      redirect_to new_officing_voter_path(id: @residence.user.id), notice: t("officing.residence.flash.create")
+    else
+      render :new
+    end
+  end
+
+  private
+
+    def residence_params
+      params.require(:residence).permit(:document_number, :document_type, :year_of_birth)
+    end
+
+    def load_officer_assignment
+      @officer_assignments = current_user.poll_officer.
+                               officer_assignments.
+                               voting_days.
+                               where(date: Time.current.to_date)
+    end
+
+    def validate_officer_assignment
+      if @officer_assignments.blank?
+        redirect_to officing_root_path, notice: t("officing.residence.flash.not_allowed")
+      end
+    end
+end
diff --git a/app/controllers/officing/results_controller.rb b/app/controllers/officing/results_controller.rb
new file mode 100644
index 000000000..b6377e25b
--- /dev/null
+++ b/app/controllers/officing/results_controller.rb
@@ -0,0 +1,141 @@
+class Officing::ResultsController < Officing::BaseController
+  before_action :load_poll
+
+  before_action :load_officer_assignments, only: :new
+  before_action :load_partial_results, only: :new
+
+  before_action :load_officer_assignment, only: :create
+  before_action :check_booth_and_date, only: :create
+  before_action :build_results, only: :create
+
+  def new
+  end
+
+  def create
+    @results.each { |result| result.save! }
+
+    notice = t("officing.results.flash.create")
+    redirect_to new_officing_poll_result_path(@poll), notice: notice
+  end
+
+  def index
+    @booth_assignment = ::Poll::BoothAssignment.includes(:booth).find(index_params[:booth_assignment_id])
+    if current_user.poll_officer.officer_assignments.final.
+                    where(booth_assignment_id: @booth_assignment.id).exists?
+
+      @partial_results = ::Poll::PartialResult.includes(:question).
+                                            where(booth_assignment_id: index_params[:booth_assignment_id]).
+                                            where(date: index_params[:date])
+      @whites = ::Poll::WhiteResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount)
+      @nulls  = ::Poll::NullResult.where(booth_assignment_id: @booth_assignment.id, date: index_params[:date]).sum(:amount)
+    end
+  end
+
+  private
+
+    def check_booth_and_date
+      if @officer_assignment.blank?
+        go_back_to_new(t("officing.results.flash.error_wrong_booth"))
+      elsif results_params[:date].blank? ||
+              Date.parse(results_params[:date]) < @poll.starts_at.to_date ||
+              Date.parse(results_params[:date]) > @poll.ends_at.to_date
+         go_back_to_new(t("officing.results.flash.error_wrong_date"))
+      end
+    end
+
+    def build_results
+      @results = []
+
+      params[:questions].each_pair do |question_id, results|
+        question = @poll.questions.find(question_id)
+        go_back_to_new if question.blank?
+
+        results.each_pair do |answer_index, count|
+          if count.present?
+            answer = question.valid_answers[answer_index.to_i]
+            go_back_to_new if question.blank?
+
+            partial_result = ::Poll::PartialResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
+                                                                 date: results_params[:date],
+                                                                 question_id: question_id,
+                                                                 answer: answer)
+            partial_result.officer_assignment_id = @officer_assignment.id
+            partial_result.amount = count.to_i
+            partial_result.author = current_user
+            partial_result.origin = 'booth'
+            @results << partial_result
+          end
+        end
+      end
+
+      build_white_results
+      build_null_results
+    end
+
+    def build_white_results
+      if results_params[:whites].present?
+        white_result = ::Poll::WhiteResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
+                                                  date: results_params[:date])
+        white_result.officer_assignment_id = @officer_assignment.id
+        white_result.amount = results_params[:whites].to_i
+        white_result.author = current_user
+        white_result.origin = 'booth'
+        @results << white_result
+      end
+    end
+
+    def build_null_results
+      if results_params[:nulls].present?
+        null_result = ::Poll::NullResult.find_or_initialize_by(booth_assignment_id: @officer_assignment.booth_assignment_id,
+                                                  date: results_params[:date])
+        null_result.officer_assignment_id = @officer_assignment.id
+        null_result.amount = results_params[:nulls].to_i
+        null_result.author = current_user
+        null_result.origin = 'booth'
+        @results << null_result
+      end
+    end
+
+    def go_back_to_new(alert = nil)
+      params[:d] = results_params[:date]
+      params[:oa] = results_params[:officer_assignment_id]
+      flash.now[:alert] = (alert || t("officing.results.flash.error_create"))
+      load_officer_assignments
+      load_partial_results
+      render :new
+    end
+
+    def load_poll
+      @poll = ::Poll.expired.includes(:questions).find(params[:poll_id])
+    end
+
+    def load_officer_assignment
+      @officer_assignment = current_user.poll_officer.
+                            officer_assignments.final.find_by(id: results_params[:officer_assignment_id])
+    end
+
+    def load_officer_assignments
+      @officer_assignments = ::Poll::OfficerAssignment.
+                  includes(booth_assignment: [:booth]).
+                  joins(:booth_assignment).
+                  final.
+                  where(id: current_user.poll_officer.officer_assignment_ids).
+                  where("poll_booth_assignments.poll_id = ?", @poll.id).
+                  order(date: :asc)
+    end
+
+    def load_partial_results
+      if @officer_assignments.present?
+        @partial_results = ::Poll::PartialResult.where(officer_assignment_id: @officer_assignments.map(&:id)).order(:booth_assignment_id, :date)
+      end
+    end
+
+    def results_params
+      params.permit(:officer_assignment_id, :date, :questions, :whites, :nulls)
+    end
+
+    def index_params
+      params.permit(:booth_assignment_id, :date)
+    end
+
+end
diff --git a/app/controllers/officing/voters_controller.rb b/app/controllers/officing/voters_controller.rb
new file mode 100644
index 000000000..dee1e00bd
--- /dev/null
+++ b/app/controllers/officing/voters_controller.rb
@@ -0,0 +1,25 @@
+class Officing::VotersController < Officing::BaseController
+  respond_to :html, :js
+
+  def new
+    @user = User.find(params[:id])
+    @polls = Poll.answerable_by(@user)
+  end
+
+  def create
+    @poll = Poll.find(voter_params[:poll_id])
+    @user = User.find(voter_params[:user_id])
+    @voter = Poll::Voter.new(document_type:   @user.document_type,
+                             document_number: @user.document_number,
+                             user: @user,
+                             poll: @poll)
+    @voter.save!
+  end
+
+  private
+
+    def voter_params
+      params.require(:voter).permit(:poll_id, :user_id)
+    end
+
+end
diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb
new file mode 100644
index 000000000..1849dff97
--- /dev/null
+++ b/app/controllers/polls/questions_controller.rb
@@ -0,0 +1,27 @@
+class Polls::QuestionsController < ApplicationController
+
+  load_and_authorize_resource :poll
+  load_and_authorize_resource :question, class: 'Poll::Question'
+
+  has_orders %w{most_voted newest oldest}, only: :show
+
+  def show
+    @commentable = @question.proposal.present? ? @question.proposal : @question
+    @comment_tree = CommentTree.new(@commentable, params[:page], @current_order)
+    set_comment_flags(@comment_tree.comments)
+
+    question_answer = @question.answers.where(author_id: current_user.try(:id)).first
+    @answers_by_question_id = {@question.id => question_answer.try(:answer)}
+  end
+
+  def answer
+    answer = @question.answers.find_or_initialize_by(author: current_user)
+
+    answer.answer = params[:answer]
+    answer.save!
+    answer.record_voter_participation
+
+    @answers_by_question_id = {@question.id => params[:answer]}
+  end
+
+end
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
new file mode 100644
index 000000000..41a038b46
--- /dev/null
+++ b/app/controllers/polls_controller.rb
@@ -0,0 +1,23 @@
+class PollsController < ApplicationController
+
+  load_and_authorize_resource
+
+  has_filters %w{current expired incoming}
+
+  ::Poll::Answer # trigger autoload
+
+  def index
+    @polls = @polls.send(@current_filter).includes(:geozones).sort_for_list.page(params[:page])
+  end
+
+  def show
+    @questions = @poll.questions.for_render.sort_for_list
+
+    @answers_by_question_id = {}
+    poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id))
+    poll_answers.each do |answer|
+      @answers_by_question_id[answer.question_id] = answer.answer
+    end
+  end
+
+end
diff --git a/app/controllers/proposal_ballots_controller.rb b/app/controllers/proposal_ballots_controller.rb
deleted file mode 100644
index 4171fcda8..000000000
--- a/app/controllers/proposal_ballots_controller.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class ProposalBallotsController < ApplicationController
-  skip_authorization_check
-
-  def index
-    @proposal_ballots = Proposal.successfull.sort_by_confidence_score
-  end
-
-end
\ No newline at end of file
diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb
index d0ff9551e..daec4a051 100644
--- a/app/controllers/proposals_controller.rb
+++ b/app/controllers/proposals_controller.rb
@@ -28,8 +28,8 @@ class ProposalsController < ApplicationController
   def index_customization
     discard_archived
     load_retired
-    load_proposal_ballots
-    load_featured unless @proposal_successfull_exists
+    load_successful_proposals
+    load_featured unless @proposal_successful_exists
   end
 
   def vote
@@ -103,8 +103,8 @@ class ProposalsController < ApplicationController
       end
     end
 
-    def load_proposal_ballots
-      @proposal_successfull_exists = Proposal.successfull.exists?
+    def load_successful_proposals
+      @proposal_successful_exists = Proposal.successful.exists?
     end
 
 end
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 62d31cd05..3f0d4db4b 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -4,6 +4,38 @@ module AdminHelper
     render "/#{namespace}/menu"
   end
 
+  def namespaced_root_path
+    "/#{namespace}"
+  end
+
+  def namespaced_header_title
+    t("#{namespace}.header.title")
+  end
+
+  def menu_tags?
+    ["tags"].include? controller_name
+  end
+
+  def menu_moderated_content?
+    ["proposals", "debates", "comments", "users"].include? controller_name
+  end
+
+  def menu_budget?
+    ["spending_proposals"].include? controller_name
+  end
+
+  def menu_polls?
+    ["polls", "questions", "officers", "booths", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name
+  end
+
+  def menu_profiles?
+    ["organizations", "officials", "moderators", "valuators", "managers"].include? controller_name
+  end
+
+  def menu_banners?
+    ["banners"].include? controller_name
+  end
+
   def official_level_options
     options = [["", 0]]
     (1..5).each do |i|
@@ -16,10 +48,14 @@ module AdminHelper
     Administrator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }
   end
 
+  def admin_submit_action(resource)
+    resource.persisted? ? "edit" : "new"
+  end
+
   private
 
     def namespace
-      controller.class.parent.name.downcase
+      controller.class.parent.name.downcase.gsub("::", "/")
     end
 
 end
diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb
index 4b9dfd311..3a07f0393 100644
--- a/app/helpers/budgets_helper.rb
+++ b/app/helpers/budgets_helper.rb
@@ -10,7 +10,7 @@ module BudgetsHelper
 
   def namespaced_budget_investment_path(investment, options={})
     case namespace
-    when "management::budgets"
+    when "management/budgets"
       management_budget_investment_path(investment.budget, investment, options)
     else
       budget_investment_path(investment.budget, investment, options)
@@ -19,7 +19,7 @@ module BudgetsHelper
 
   def namespaced_budget_investment_vote_path(investment, options={})
     case namespace
-    when "management::budgets"
+    when "management/budgets"
       vote_management_budget_investment_path(investment.budget, investment, options)
     else
       vote_budget_investment_path(investment.budget, investment, options)
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index b9e69ddf9..df6e57b61 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -23,6 +23,8 @@ module CommentsHelper
   def commentable_path(comment)
     if comment.commentable_type == "Budget::Investment"
       budget_investment_path(comment.commentable.budget_id, comment.commentable)
+    elsif comment.commentable_type == "Poll::Question"
+      question_path(comment.commentable)
     else
       comment.commentable
     end
diff --git a/app/helpers/officers_helper.rb b/app/helpers/officers_helper.rb
new file mode 100644
index 000000000..f29bcf728
--- /dev/null
+++ b/app/helpers/officers_helper.rb
@@ -0,0 +1,7 @@
+module OfficersHelper
+
+  def officer_label(officer)
+    truncate([officer.name, officer.email].compact.join(' - '), length: 100)
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/officing_helper.rb b/app/helpers/officing_helper.rb
new file mode 100644
index 000000000..2cfebf832
--- /dev/null
+++ b/app/helpers/officing_helper.rb
@@ -0,0 +1,36 @@
+module OfficingHelper
+
+  def officer_assignments_select_options(officer_assignments)
+    options = []
+    officer_assignments.each do |oa|
+      options << ["#{oa.booth_assignment.booth.name}: #{l(oa.date.to_date, format: :long)}", oa.id]
+    end
+    options_for_select(options)
+  end
+
+  def booths_for_officer_select_options(officer_assignments)
+    options = []
+    officer_assignments.each do |oa|
+      options << ["#{oa.booth_assignment.booth.name}", oa.id]
+    end
+    options.sort! {|x,y| x[0]<=>y[0]}
+    options_for_select(options, params[:oa])
+  end
+
+  def recount_to_compare_with_final_recount(final_recount)
+    recount = final_recount.booth_assignment.recounts.select {|r| r.date == final_recount.date}.first
+    recount.present? ? recount.count : "-"
+  end
+
+  def system_recount_to_compare_with_final_recount(final_recount)
+    final_recount.booth_assignment.voters.select {|v| v.created_at.to_date == final_recount.date}.size
+  end
+
+  def answer_result_value(question_id, answer_index)
+    return nil if params.blank?
+    return nil if params[:questions].blank?
+    return nil if params[:questions][question_id.to_s].blank?
+    params[:questions][question_id.to_s][answer_index.to_s]
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/poll_final_recounts_helper.rb b/app/helpers/poll_final_recounts_helper.rb
new file mode 100644
index 000000000..e196cb65b
--- /dev/null
+++ b/app/helpers/poll_final_recounts_helper.rb
@@ -0,0 +1,7 @@
+module PollFinalRecountsHelper
+
+  def final_recount_for_date(final_recounts, date)
+    final_recounts.select {|f| f.date == date}.first
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/poll_recounts_helper.rb b/app/helpers/poll_recounts_helper.rb
new file mode 100644
index 000000000..c47402163
--- /dev/null
+++ b/app/helpers/poll_recounts_helper.rb
@@ -0,0 +1,15 @@
+module PollRecountsHelper
+
+  def recount_for_date(recounts, date)
+    recounts.select {|r| r.date == date}.first
+  end
+
+  def booth_assignment_sum_recounts(ba)
+    ba.recounts.any? ? ba.recounts.to_a.sum(&:count) : nil
+  end
+
+  def booth_assignment_sum_final_recounts(ba)
+    ba.final_recounts.any? ? ba.final_recounts.to_a.sum(&:count) :nil
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb
new file mode 100644
index 000000000..5425a6b52
--- /dev/null
+++ b/app/helpers/polls_helper.rb
@@ -0,0 +1,49 @@
+module PollsHelper
+
+  def poll_select_options(include_all=nil)
+    options = @polls.collect {|poll|
+      [poll.name, current_path_with_query_params(poll_id: poll.id)]
+    }
+    options << all_polls if include_all
+    options_for_select(options, request.fullpath)
+  end
+
+  def all_polls
+    [I18n.t("polls.all"), admin_questions_path]
+  end
+
+  def poll_dates(poll)
+    if poll.starts_at.blank? || poll.ends_at.blank?
+      I18n.t("polls.no_dates")
+    else
+      I18n.t("polls.dates", open_at: l(poll.starts_at.to_date), closed_at: l(poll.ends_at.to_date))
+    end
+  end
+
+  def poll_dates_select_options(poll)
+    options = []
+    (poll.starts_at.to_date..poll.ends_at.to_date).each do |date|
+      options << [l(date, format: :long), l(date)]
+    end
+    options_for_select(options, params[:d])
+  end
+
+  def poll_final_recount_option(poll)
+    final_date = poll.ends_at.to_date + 1.day
+    options_for_select([[I18n.t("polls.final_date"), l(final_date)]])
+  end
+
+  def poll_booths_select_options(poll)
+    options = []
+    poll.booths.each do |booth|
+      options << [booth_name_with_location(booth), booth.id]
+    end
+    options_for_select(options)
+  end
+
+  def booth_name_with_location(booth)
+    location = booth.location.blank? ? "" : " (#{booth.location})"
+    booth.name + location
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb
index a99b98fea..8df52e6eb 100644
--- a/app/models/abilities/administrator.rb
+++ b/app/models/abilities/administrator.rb
@@ -32,7 +32,7 @@ module Abilities
       can :mark_featured, Debate
       can :unmark_featured, Debate
 
-      can :comment_as_administrator, [Debate, Comment, Proposal, Budget::Investment]
+      can :comment_as_administrator, [Debate, Comment, Proposal, Poll::Question, Budget::Investment]
 
       can [:search, :create, :index, :destroy], ::Moderator
       can [:search, :create, :index, :summary], ::Valuator
@@ -50,8 +50,17 @@ module Abilities
       can :create, Budget::ValuatorAssignment
 
       can [:search, :edit, :update, :create, :index, :destroy], Banner
+
       can [:index, :create, :edit, :update, :destroy], Geozone
 
+      can [:read, :create, :update, :destroy, :add_question, :remove_question, :search_booths, :search_questions, :search_officers], Poll
+      can [:read, :create, :update, :destroy], Poll::Booth
+      can [:search, :create, :index, :destroy], ::Poll::Officer
+      can [:create, :destroy], ::Poll::BoothAssignment
+      can [:create, :destroy], ::Poll::OfficerAssignment
+      can [:read, :create, :update], Poll::Question
+      can :destroy, Poll::Question # , comments_count: 0, votes_up: 0
+
       can :manage, SiteCustomization::Page
       can :manage, SiteCustomization::Image
       can :manage, SiteCustomization::ContentBlock
diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb
index 7ac6a12f4..6a8ef594c 100644
--- a/app/models/abilities/common.rb
+++ b/app/models/abilities/common.rb
@@ -53,6 +53,12 @@ module Abilities
 
         can :create, DirectMessage
         can :show, DirectMessage, sender_id: user.id
+        can :answer, Poll do |poll|
+          poll.answerable_by?(user)
+        end
+        can :answer, Poll::Question do |question|
+          question.answerable_by?(user)
+        end
       end
 
       can [:create, :show], ProposalNotification, proposal: { author_id: user.id }
diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb
index 98080aa4c..c2b6cd6d7 100644
--- a/app/models/abilities/everyone.rb
+++ b/app/models/abilities/everyone.rb
@@ -6,6 +6,8 @@ module Abilities
       can [:read, :map], Debate
       can [:read, :map, :summary], Proposal
       can :read, Comment
+      can :read, Poll
+      can :read, Poll::Question
       can [:read, :welcome], Budget
       can :read, Budget::Investment
       can :read, SpendingProposal
diff --git a/app/models/abilities/moderator.rb b/app/models/abilities/moderator.rb
index 52d838f9c..5740e302e 100644
--- a/app/models/abilities/moderator.rb
+++ b/app/models/abilities/moderator.rb
@@ -5,7 +5,7 @@ module Abilities
     def initialize(user)
       self.merge Abilities::Moderation.new(user)
 
-      can :comment_as_moderator, [Debate, Comment, Proposal, Budget::Investment]
+      can :comment_as_moderator, [Debate, Comment, Proposal, Budget::Investment, Poll::Question]
     end
   end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index d4b1cc8e7..cd84a3578 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -10,7 +10,8 @@ class Comment < ActiveRecord::Base
 
   validates :body, presence: true
   validates :user, presence: true
-  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Budget::Investment"]
+
+  validates_inclusion_of :commentable_type, in: ["Debate", "Proposal", "Budget::Investment", "Poll::Question"]
 
   validate :validate_body_length
 
diff --git a/app/models/concerns/searchable.rb b/app/models/concerns/searchable.rb
index 4d717959e..147a37fbc 100644
--- a/app/models/concerns/searchable.rb
+++ b/app/models/concerns/searchable.rb
@@ -12,7 +12,7 @@ module Searchable
       },
       ignoring: :accents,
       ranked_by: '(:tsearch)',
-      order_within_rank: "#{self.table_name}.cached_votes_up DESC"
+      order_within_rank: (self.column_names.include?('cached_votes_up') ? "#{self.table_name}.cached_votes_up DESC" : nil)
     }
   end
 
diff --git a/app/models/failed_census_call.rb b/app/models/failed_census_call.rb
index ac792d7b7..b7d60e63a 100644
--- a/app/models/failed_census_call.rb
+++ b/app/models/failed_census_call.rb
@@ -1,3 +1,4 @@
 class FailedCensusCall < ActiveRecord::Base
   belongs_to :user, counter_cache: true
+  belongs_to :poll_officer, class_name: 'Poll::Officer', counter_cache: true
 end
diff --git a/app/models/geozone.rb b/app/models/geozone.rb
index 7e38ce97d..824879ec6 100644
--- a/app/models/geozone.rb
+++ b/app/models/geozone.rb
@@ -9,6 +9,10 @@ class Geozone < ActiveRecord::Base
     Geozone.pluck(:name)
   end
 
+  def self.city
+    where(name: 'city').first
+  end
+
   def safe_to_destroy?
     Geozone.reflect_on_all_associations(:has_many).all? do |association|
       association.klass.where(geozone: self).empty?
diff --git a/app/models/officing/residence.rb b/app/models/officing/residence.rb
new file mode 100644
index 000000000..6343fc5f7
--- /dev/null
+++ b/app/models/officing/residence.rb
@@ -0,0 +1,126 @@
+class Officing::Residence
+  include ActiveModel::Model
+  include ActiveModel::Validations::Callbacks
+
+  attr_accessor :user, :officer, :document_number, :document_type, :year_of_birth
+
+  before_validation :call_census_api
+
+  validates_presence_of :document_number
+  validates_presence_of :document_type
+  validates_presence_of :year_of_birth
+
+  validate :allowed_age
+  validate :residence_in_madrid
+
+  def initialize(attrs={})
+    super
+    clean_document_number
+  end
+
+  def save
+    return false unless valid?
+
+    if user_exists?
+      self.user = find_user_by_document
+      self.user.update(verified_at: Time.current)
+    else
+      user_params = {
+        document_number:       document_number,
+        document_type:         document_type,
+        geozone:               self.geozone,
+        date_of_birth:         date_of_birth.to_datetime,
+        gender:                gender,
+        residence_verified_at: Time.current,
+        verified_at:           Time.current,
+        erased_at:             Time.current,
+        password:              random_password,
+        terms_of_service:      '1',
+        email:                 nil
+      }
+      self.user = User.create!(user_params)
+    end
+  end
+
+  def store_failed_census_call
+    FailedCensusCall.create({
+      user: user,
+      document_number: document_number,
+      document_type:   document_type,
+      year_of_birth:   year_of_birth,
+      poll_officer:    officer
+    })
+
+  end
+
+  def user_exists?
+    find_user_by_document.present?
+  end
+
+  def find_user_by_document
+    User.where(document_number: document_number,
+               document_type:   document_type).first
+  end
+
+   def residence_in_madrid
+    return if errors.any?
+
+    unless residency_valid?
+      store_failed_census_call
+      errors.add(:residence_in_madrid, false)
+    end
+  end
+
+  def allowed_age
+    return if errors[:year_of_birth].any?
+    return unless @census_api_response.valid?
+
+    unless allowed_age?
+      errors.add(:year_of_birth, I18n.t('verification.residence.new.error_not_allowed_age'))
+    end
+  end
+
+  def allowed_age?
+    Age.in_years(date_of_birth) >= User.minimum_required_age
+  end
+
+  def geozone
+    Geozone.where(census_code: district_code).first
+  end
+
+  def district_code
+    @census_api_response.district_code
+  end
+
+  def gender
+    @census_api_response.gender
+  end
+
+  def date_of_birth
+    @census_api_response.date_of_birth
+  end
+
+  private
+
+    def call_census_api
+      @census_api_response = CensusApi.new.call(document_type, document_number)
+    end
+
+    def residency_valid?
+      @census_api_response.valid? &&
+      @census_api_response.date_of_birth.year.to_s == year_of_birth.to_s
+    end
+
+    def census_year_of_birth
+      @census_api_response.date_of_birth.year
+    end
+
+    def clean_document_number
+      self.document_number = self.document_number.gsub(/[^a-z0-9]+/i, "").upcase unless self.document_number.blank?
+    end
+
+    def random_password
+      (0...20).map { ('a'..'z').to_a[rand(26)] }.join
+    end
+
+end
diff --git a/app/models/poll.rb b/app/models/poll.rb
new file mode 100644
index 000000000..c6be3073a
--- /dev/null
+++ b/app/models/poll.rb
@@ -0,0 +1,65 @@
+class Poll < ActiveRecord::Base
+  has_many :booth_assignments, class_name: "Poll::BoothAssignment"
+  has_many :booths, through: :booth_assignments
+  has_many :partial_results, through: :booth_assignments
+  has_many :white_results, through: :booth_assignments
+  has_many :null_results, through: :booth_assignments
+  has_many :voters
+  has_many :officer_assignments, through: :booth_assignments
+  has_many :officers, through: :officer_assignments
+  has_many :questions
+
+  has_and_belongs_to_many :geozones
+
+  validates :name, presence: true
+
+  validate :date_range
+
+  scope :current,  -> { where('starts_at <= ? and ? <= ends_at', Time.current, Time.current) }
+  scope :incoming, -> { where('? < starts_at', Time.current) }
+  scope :expired,  -> { where('ends_at < ?', Time.current) }
+  scope :published,  -> { where('published = ?', true) }
+  scope :by_geozone_id, ->(geozone_id) { where(geozones: {id: geozone_id}.joins(:geozones)) }
+
+  scope :sort_for_list, -> { order(:geozone_restricted, :starts_at, :name) }
+
+  def current?(timestamp = DateTime.current)
+    starts_at <= timestamp && timestamp <= ends_at
+  end
+
+  def incoming?(timestamp = DateTime.current)
+    timestamp < starts_at
+  end
+
+  def expired?(timestamp = DateTime.current)
+    ends_at < timestamp
+  end
+
+  def answerable_by?(user)
+    user.present? &&
+      user.level_two_or_three_verified? &&
+      current? &&
+      (!geozone_restricted || geozone_ids.include?(user.geozone_id))
+  end
+
+  def self.answerable_by(user)
+    return none if user.nil? || user.unverified?
+    current.joins('LEFT JOIN "geozones_polls" ON "geozones_polls"."poll_id" = "polls"."id"')
+           .where('geozone_restricted = ? OR geozones_polls.geozone_id = ?', false, user.geozone_id)
+  end
+
+  def votable_by?(user)
+    !document_has_voted?(user.document_number, user.document_type)
+  end
+
+  def document_has_voted?(document_number, document_type)
+    voters.where(document_number: document_number, document_type: document_type).exists?
+  end
+
+  def date_range
+    unless starts_at.present? && ends_at.present? && starts_at <= ends_at
+      errors.add(:starts_at, I18n.t('errors.messages.invalid_date_range'))
+    end
+  end
+
+end
diff --git a/app/models/poll/answer.rb b/app/models/poll/answer.rb
new file mode 100644
index 000000000..52fb11469
--- /dev/null
+++ b/app/models/poll/answer.rb
@@ -0,0 +1,19 @@
+class Poll::Answer < ActiveRecord::Base
+
+  belongs_to :question, -> { with_hidden }
+  belongs_to :author, ->   { with_hidden }, class_name: 'User', foreign_key: 'author_id'
+
+  delegate :poll, :poll_id, to: :question
+
+  validates :question, presence: true
+  validates :author, presence: true
+  validates :answer, presence: true
+  validates :answer, inclusion: {in: ->(a) { a.question.valid_answers }}
+
+  scope :by_author, -> (author_id) { where(author_id: author_id) }
+  scope :by_question, -> (question_id) { where(question_id: question_id) }
+
+  def record_voter_participation
+    Poll::Voter.create!(user: author, poll: poll)
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/booth.rb b/app/models/poll/booth.rb
new file mode 100644
index 000000000..c7fb63efc
--- /dev/null
+++ b/app/models/poll/booth.rb
@@ -0,0 +1,13 @@
+class Poll
+  class Booth < ActiveRecord::Base
+    has_many :booth_assignments, class_name: "Poll::BoothAssignment"
+    has_many :polls, through: :booth_assignments
+
+    validates :name, presence: true, uniqueness: true
+
+    def self.search(terms)
+      return Booth.none if terms.blank?
+      Booth.where("name ILIKE ? OR location ILIKE ?", "%#{terms}%", "%#{terms}%")
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/booth_assignment.rb b/app/models/poll/booth_assignment.rb
new file mode 100644
index 000000000..0519fffa6
--- /dev/null
+++ b/app/models/poll/booth_assignment.rb
@@ -0,0 +1,15 @@
+class Poll
+  class BoothAssignment < ActiveRecord::Base
+    belongs_to :booth
+    belongs_to :poll
+
+    has_many :officer_assignments, class_name: "Poll::OfficerAssignment", dependent: :destroy
+    has_many :recounts, class_name: "Poll::Recount", dependent: :destroy
+    has_many :final_recounts, class_name: "Poll::FinalRecount", dependent: :destroy
+    has_many :officers, through: :officer_assignments
+    has_many :voters
+    has_many :partial_results
+    has_many :white_results
+    has_many :null_results
+  end
+end
diff --git a/app/models/poll/final_recount.rb b/app/models/poll/final_recount.rb
new file mode 100644
index 000000000..6ebf5eede
--- /dev/null
+++ b/app/models/poll/final_recount.rb
@@ -0,0 +1,19 @@
+class Poll
+  class FinalRecount < ActiveRecord::Base
+    belongs_to :booth_assignment, class_name: "Poll::BoothAssignment"
+    belongs_to :officer_assignment, class_name: "Poll::OfficerAssignment"
+
+    validates :booth_assignment_id, presence: true
+    validates :date, presence: true, uniqueness: {scope: :booth_assignment_id}
+    validates :count, presence: true, numericality: {only_integer: true}
+
+    before_save :update_logs
+
+    def update_logs
+      if self.count_changed? && self.count_was.present?
+        self.count_log += ":#{self.count_was.to_s}"
+        self.officer_assignment_id_log += ":#{self.officer_assignment_id_was.to_s}"
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/null_result.rb b/app/models/poll/null_result.rb
new file mode 100644
index 000000000..222432c7f
--- /dev/null
+++ b/app/models/poll/null_result.rb
@@ -0,0 +1,23 @@
+class Poll::NullResult < ActiveRecord::Base
+
+  VALID_ORIGINS = %w{ web booth }
+
+  belongs_to :author, ->   { with_hidden }, class_name: 'User', foreign_key: 'author_id'
+  belongs_to :booth_assignment
+  belongs_to :officer_assignment
+
+  validates :author, presence: true
+  validates :origin, inclusion: {in: VALID_ORIGINS}
+
+  scope :by_author, -> (author_id) { where(author_id: author_id) }
+
+  before_save :update_logs
+
+  def update_logs
+    if self.amount_changed? && self.amount_was.present?
+      self.amount_log += ":#{self.amount_was.to_s}"
+      self.officer_assignment_id_log += ":#{self.officer_assignment_id_was.to_s}"
+      self.author_id_log += ":#{self.author_id_was.to_s}"
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/officer.rb b/app/models/poll/officer.rb
new file mode 100644
index 000000000..bf4c73c36
--- /dev/null
+++ b/app/models/poll/officer.rb
@@ -0,0 +1,26 @@
+class Poll
+  class Officer < ActiveRecord::Base
+    belongs_to :user
+    has_many :officer_assignments, class_name: "Poll::OfficerAssignment"
+    has_many :failed_census_calls, foreign_key: :poll_officer_id
+
+    validates :user_id, presence: true, uniqueness: true
+
+    delegate :name, :email, to: :user
+
+    def voting_days_assigned_polls
+      officer_assignments.voting_days.includes(booth_assignment: :poll).
+                               map(&:booth_assignment).
+                               map(&:poll).uniq.compact.
+                               sort {|x, y| y.ends_at <=> x.ends_at}
+    end
+
+    def final_days_assigned_polls
+      officer_assignments.final.includes(booth_assignment: :poll).
+                               map(&:booth_assignment).
+                               map(&:poll).uniq.compact.
+                               sort {|x, y| y.ends_at <=> x.ends_at}
+    end
+
+  end
+end
diff --git a/app/models/poll/officer_assignment.rb b/app/models/poll/officer_assignment.rb
new file mode 100644
index 000000000..cd4f53266
--- /dev/null
+++ b/app/models/poll/officer_assignment.rb
@@ -0,0 +1,25 @@
+class Poll
+  class OfficerAssignment < ActiveRecord::Base
+    belongs_to :officer
+    belongs_to :booth_assignment
+    has_one :recount
+    has_many :final_recounts
+    has_many :partial_results
+    has_many :voters
+
+    validates :officer_id, presence: true
+    validates :booth_assignment_id, presence: true
+    validates :date, presence: true, uniqueness: { scope: [:officer_id, :booth_assignment_id] }
+
+    delegate :poll_id, :booth_id, to: :booth_assignment
+
+    scope :voting_days, -> { where(final: false) }
+    scope :final,       -> { where(final: true) }
+
+    before_create :log_user_data
+
+    def log_user_data
+      self.user_data_log = "#{officer.user_id} - #{officer.user.name_and_email}"
+    end
+  end
+end
diff --git a/app/models/poll/partial_result.rb b/app/models/poll/partial_result.rb
new file mode 100644
index 000000000..e42589a03
--- /dev/null
+++ b/app/models/poll/partial_result.rb
@@ -0,0 +1,28 @@
+class Poll::PartialResult < ActiveRecord::Base
+
+  VALID_ORIGINS = %w{ web booth }
+
+  belongs_to :question, -> { with_hidden }
+  belongs_to :author, ->   { with_hidden }, class_name: 'User', foreign_key: 'author_id'
+  belongs_to :booth_assignment
+  belongs_to :officer_assignment
+
+  validates :question, presence: true
+  validates :author, presence: true
+  validates :answer, presence: true
+  validates :answer, inclusion: {in: ->(a) { a.question.valid_answers }}
+  validates :origin, inclusion: {in: VALID_ORIGINS}
+
+  scope :by_author, -> (author_id) { where(author_id: author_id) }
+  scope :by_question, -> (question_id) { where(question_id: question_id) }
+
+  before_save :update_logs
+
+  def update_logs
+    if self.amount_changed? && self.amount_was.present?
+      self.amount_log += ":#{self.amount_was.to_s}"
+      self.officer_assignment_id_log += ":#{self.officer_assignment_id_was.to_s}"
+      self.author_id_log += ":#{self.author_id_was.to_s}"
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/question.rb b/app/models/poll/question.rb
new file mode 100644
index 000000000..dd4eae3bc
--- /dev/null
+++ b/app/models/poll/question.rb
@@ -0,0 +1,70 @@
+class Poll::Question < ActiveRecord::Base
+  include Measurable
+  include Searchable
+
+  acts_as_paranoid column: :hidden_at
+  include ActsAsParanoidAliases
+
+  belongs_to :poll
+  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
+
+  has_many :comments, as: :commentable
+  has_many :answers
+  has_many :partial_results
+  belongs_to :proposal
+
+  validates :title, presence: true
+  validates :author, presence: true
+
+  validates :title, length: { minimum: 4 }
+  validates :description, length: { maximum: Poll::Question.description_max_length }
+
+  scope :by_poll_id,    ->(poll_id)    { where(poll_id: poll_id) }
+
+  scope :sort_for_list, -> { order('poll_questions.proposal_id IS NULL', :created_at)}
+  scope :for_render,    -> { includes(:author, :proposal) }
+
+  def self.search(params)
+    results = self.all
+    results = results.by_poll_id(params[:poll_id]) if params[:poll_id].present?
+    results = results.pg_search(params[:search])   if params[:search].present?
+    results
+  end
+
+  def searchable_values
+    { title                 => 'A',
+      proposal.try(:title)  => 'A',
+      description           => 'B',
+      author.username       => 'C',
+      author_visible_name   => 'C' }
+  end
+
+  def description
+    super.try :html_safe
+  end
+
+  def valid_answers
+    (super.try(:split, ',').compact || []).map(&:strip)
+  end
+
+  def copy_attributes_from_proposal(proposal)
+    if proposal.present?
+      self.author = proposal.author
+      self.author_visible_name = proposal.author.name
+      self.proposal_id = proposal.id
+      self.title = proposal.title
+      self.description = proposal.description
+      self.valid_answers = I18n.t('poll_questions.default_valid_answers')
+    end
+  end
+
+  def answerable_by?(user)
+    poll.answerable_by?(user)
+  end
+
+  def self.answerable_by(user)
+    return none if user.nil? || user.unverified?
+    where(poll_id: Poll.answerable_by(user).pluck(:id))
+  end
+
+end
diff --git a/app/models/poll/recount.rb b/app/models/poll/recount.rb
new file mode 100644
index 000000000..b4e28583e
--- /dev/null
+++ b/app/models/poll/recount.rb
@@ -0,0 +1,20 @@
+class Poll
+  class Recount < ActiveRecord::Base
+    belongs_to :booth_assignment, class_name: "Poll::BoothAssignment"
+    belongs_to :officer_assignment, class_name: "Poll::OfficerAssignment"
+
+    validates :booth_assignment_id, presence: true
+    validates :date, presence: true, uniqueness: {scope: :booth_assignment_id}
+    validates :officer_assignment_id, presence: true, uniqueness: {scope: :booth_assignment_id}
+    validates :count, presence: true, numericality: {only_integer: true}
+
+    before_save :update_logs
+
+    def update_logs
+      if self.count_changed? && self.count_was.present?
+        self.count_log += ":#{self.count_was.to_s}"
+        self.officer_assignment_id_log += ":#{self.officer_assignment_id_was.to_s}"
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb
new file mode 100644
index 000000000..8fe612151
--- /dev/null
+++ b/app/models/poll/voter.rb
@@ -0,0 +1,59 @@
+class Poll
+  class Voter < ActiveRecord::Base
+    belongs_to :poll
+    belongs_to :user
+    belongs_to :geozone
+    belongs_to :booth_assignment
+    belongs_to :officer_assignment
+
+    validates :poll_id, presence: true
+    validates :user_id, presence: true
+
+    validates :document_number, presence: true, uniqueness: { scope: [:poll_id, :document_type], message: :has_voted }
+
+    before_validation :set_demographic_info, :set_document_info
+
+    def set_demographic_info
+      return unless user.present?
+
+      self.gender  = user.gender
+      self.age     = user.age
+      self.geozone = user.geozone
+    end
+
+    def set_document_info
+      return unless user.present?
+
+      self.document_type   = user.document_type
+      self.document_number = user.document_number
+    end
+
+    private
+
+      def in_census?
+        census_api_response.valid?
+      end
+
+      def census_api_response
+        @census_api_response ||= CensusApi.new.call(document_type, document_number)
+      end
+
+      def fill_stats_fields
+        if in_census?
+          self.gender = census_api_response.gender
+          self.geozone_id = Geozone.select(:id).where(census_code: census_api_response.district_code).first.try(:id)
+          self.age = voter_age(census_api_response.date_of_birth)
+        end
+      end
+
+      def voter_age(dob)
+        if dob.blank?
+          nil
+        else
+          now = Time.now.utc.to_date
+          now.year - dob.year - ((now.month > dob.month || (now.month == dob.month && now.day >= dob.day)) ? 0 : 1)
+        end
+      end
+
+  end
+end
\ No newline at end of file
diff --git a/app/models/poll/white_result.rb b/app/models/poll/white_result.rb
new file mode 100644
index 000000000..5b0aa4966
--- /dev/null
+++ b/app/models/poll/white_result.rb
@@ -0,0 +1,23 @@
+class Poll::WhiteResult < ActiveRecord::Base
+
+  VALID_ORIGINS = %w{ web booth }
+
+  belongs_to :author, ->   { with_hidden }, class_name: 'User', foreign_key: 'author_id'
+  belongs_to :booth_assignment
+  belongs_to :officer_assignment
+
+  validates :author, presence: true
+  validates :origin, inclusion: {in: VALID_ORIGINS}
+
+  scope :by_author, -> (author_id) { where(author_id: author_id) }
+
+  before_save :update_logs
+
+  def update_logs
+    if self.amount_changed? && self.amount_was.present?
+      self.amount_log += ":#{self.amount_was.to_s}"
+      self.officer_assignment_id_log += ":#{self.officer_assignment_id_was.to_s}"
+      self.author_id_log += ":#{self.author_id_was.to_s}"
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index 32175f9f7..0abde3584 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -45,12 +45,12 @@ class Proposal < ActiveRecord::Base
   scope :sort_by_relevance,        -> { all }
   scope :sort_by_flags,            -> { order(flags_count: :desc, updated_at: :desc) }
   scope :sort_by_archival_date,    -> { archived.sort_by_confidence_score }
-  scope :archived,                 -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
-  scope :not_archived,             -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago)}
+  scope :archived,                 -> { where("proposals.created_at <= ?", Setting["months_to_archive_proposals"].to_i.months.ago) }
+  scope :not_archived,             -> { where("proposals.created_at > ?", Setting["months_to_archive_proposals"].to_i.months.ago) }
   scope :last_week,                -> { where("proposals.created_at >= ?", 7.days.ago)}
   scope :retired,                  -> { where.not(retired_at: nil) }
   scope :not_retired,              -> { where(retired_at: nil) }
-  scope :successfull,              -> { where("cached_votes_up >= ?", Proposal.votes_needed_for_success)}
+  scope :successful,               -> { where("cached_votes_up >= ?", Proposal.votes_needed_for_success) }
 
   def to_param
     "#{id}-#{title}".parameterize
@@ -155,7 +155,7 @@ class Proposal < ActiveRecord::Base
     Setting['votes_for_proposal_success'].to_i
   end
 
-  def successfull?
+  def successful?
     total_votes >= Proposal.votes_needed_for_success
   end
 
diff --git a/app/models/signature.rb b/app/models/signature.rb
index a645fbfb6..543965aed 100644
--- a/app/models/signature.rb
+++ b/app/models/signature.rb
@@ -46,8 +46,8 @@ class Signature < ActiveRecord::Base
     user_params = {
       document_number: document_number,
       created_from_signature: true,
-      verified_at: Time.now,
-      erased_at: Time.now,
+      verified_at: Time.current,
+      erased_at: Time.current,
       password: random_password,
       terms_of_service: '1',
       email: nil,
diff --git a/app/models/user.rb b/app/models/user.rb
index f8991d676..c3038c88a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -13,6 +13,7 @@ class User < ActiveRecord::Base
   has_one :moderator
   has_one :valuator
   has_one :manager
+  has_one :poll_officer, class_name: "Poll::Officer"
   has_one :organization
   has_one :lock
   has_many :flags
@@ -55,6 +56,7 @@ class User < ActiveRecord::Base
   scope :by_document,    -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) }
   scope :email_digest,   -> { where(email_digest: true) }
   scope :active,         -> { where(erased_at: nil) }
+  scope :erased,         -> { where.not(erased_at: nil) }
 
   before_validation :clean_document_number
 
@@ -123,6 +125,10 @@ class User < ActiveRecord::Base
     manager.present?
   end
 
+  def poll_officer?
+    poll_officer.present?
+  end
+
   def organization?
     organization.present?
   end
@@ -188,6 +194,22 @@ class User < ActiveRecord::Base
     erased_at.present?
   end
 
+  def take_votes_if_erased_document(document_number, document_type)
+    erased_user = User.erased.where(document_number: document_number).where(document_type: document_type).first
+    if erased_user.present?
+      self.take_votes_from(erased_user)
+      erased_user.update(document_number: nil, document_type: nil)
+    end
+  end
+
+  def take_votes_from(other_user)
+    return if other_user.blank?
+    Poll::Voter.where(user_id: other_user.id).update_all(user_id: self.id)
+    Budget::Ballot.where(user_id: other_user.id).update_all(user_id: self.id)
+    Vote.where("voter_id = ? AND voter_type = ?", other_user.id, "User").update_all(voter_id: self.id)
+    self.update(former_users_data_log: "#{self.former_users_data_log} | id: #{other_user.id} - #{Time.current.strftime('%Y-%m-%d %H:%M:%S')}")
+  end
+
   def locked?
     Lock.find_or_create_by(user: self).locked?
   end
@@ -241,6 +263,10 @@ class User < ActiveRecord::Base
     "#{name} (#{email})"
   end
 
+  def age
+    Age.in_years(date_of_birth)
+  end
+
   def save_requiring_finish_signup
     begin
       self.registering_with_oauth = true
diff --git a/app/models/verification/management/document.rb b/app/models/verification/management/document.rb
index 4264154d3..420dcf49c 100644
--- a/app/models/verification/management/document.rb
+++ b/app/models/verification/management/document.rb
@@ -32,7 +32,7 @@ class Verification::Management::Document
   end
 
   def under_age?(response)
-    User.minimum_required_age.years.ago.beginning_of_day < response.date_of_birth.beginning_of_day
+    response.date_of_birth.blank? || Age.in_years(response.date_of_birth) < User.minimum_required_age
   end
 
   def verified?
diff --git a/app/models/verification/residence.rb b/app/models/verification/residence.rb
index eda562671..ea000677f 100644
--- a/app/models/verification/residence.rb
+++ b/app/models/verification/residence.rb
@@ -26,6 +26,9 @@ class Verification::Residence
 
   def save
     return false unless valid?
+
+    user.take_votes_if_erased_document(document_number, document_type)
+
     user.update(document_number:       document_number,
                 document_type:         document_type,
                 geozone:               self.geozone,
@@ -36,11 +39,11 @@ class Verification::Residence
 
   def allowed_age
     return if errors[:date_of_birth].any?
-    errors.add(:date_of_birth, I18n.t('verification.residence.new.error_not_allowed_age')) unless self.date_of_birth <= User.minimum_required_age.years.ago
+    errors.add(:date_of_birth, I18n.t('verification.residence.new.error_not_allowed_age')) unless Age.in_years(self.date_of_birth) >= User.minimum_required_age
   end
 
   def document_number_uniqueness
-    errors.add(:document_number, I18n.t('errors.messages.taken')) if User.where(document_number: document_number).any?
+    errors.add(:document_number, I18n.t('errors.messages.taken')) if User.active.where(document_number: document_number).any?
   end
 
   def store_failed_attempt
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 65d8bed79..fecd29419 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,144 +1,166 @@
-<nav class="admin-sidebar">
-  <ul id="admin_menu">
+<div class="admin-sidebar" data-equalizer-watch>
+  <ul id="admin_menu" data-accordion-menu>
 
-    <li <%= "class=active" if controller_name == "tags" %>>
-      <%= link_to admin_tags_path do %>
-        <span class="icon-tag"></span><%= t("admin.menu.debate_topics") %>
-      <% end %>
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-proposals"></span>
+        <strong><%= t("admin.menu.title_categories") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_tags? %>>
+        <li <%= "class=active" if controller_name == "tags" %>>
+          <%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
+        </li>
+      </ul>
     </li>
 
-    <li <%= "class=active" if controller_name == "proposals" %>>
-      <%= link_to admin_proposals_path do %>
-        <span class="icon-proposals"></span><%= t("admin.menu.hidden_proposals") %>
-      <% end %>
-    </li>
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-eye"></span>
+        <strong><%= t("admin.menu.title_moderated_content") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_moderated_content? %>>
+        <li <%= "class=active" if controller_name == "proposals" %>>
+          <%= link_to t("admin.menu.hidden_proposals"), admin_proposals_path %>
+        </li>
 
-    <% if feature?(:debates) %>
-      <li <%= "class=active" if controller_name == "debates" %>>
-        <%= link_to admin_debates_path do %>
-          <span class="icon-debates"></span><%= t("admin.menu.hidden_debates") %>
+        <% if feature?(:debates) %>
+          <li <%= "class=active" if controller_name == "debates" %>>
+            <%= link_to t("admin.menu.hidden_debates"), admin_debates_path %>
+          </li>
         <% end %>
-      </li>
-    <% end %>
 
-    <li <%= "class=active" if controller_name == "comments" %>>
-      <%= link_to admin_comments_path do %>
-        <span class="icon-comments"></span><%= t("admin.menu.hidden_comments") %>
-      <% end %>
+        <li <%= "class=active" if controller_name == "comments" %>>
+          <%= link_to t("admin.menu.hidden_comments"), admin_comments_path %>
+        </li>
+
+        <li <%= "class=active" if controller_name == "users" %>>
+          <%= link_to t("admin.menu.hidden_users"), admin_users_path %>
+        </li>
+      </ul>
     </li>
 
     <% if feature?(:spending_proposals) %>
-      <li <%= "class=active" if controller_name == "spending_proposals" %>>
-        <%= link_to admin_spending_proposals_path do %>
-          <span class="icon-budget"></span><%= t("admin.menu.spending_proposals") %>
-        <% end %>
+      <li class="section-title">
+        <a href="#">
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.title_budgets") %></strong>
+        </a>
+        <ul <%= "class=is-active" if menu_budget? %>>
+          <li <%= "class=active" if controller_name == "spending_proposals" %>>
+            <%= link_to t("admin.menu.spending_proposals"), admin_spending_proposals_path %>
+          </li>
+        </ul>
+      </li>
+    <% end %>
+
+
+    <% if feature?(:polls) %>
+      <li class="section-title">
+        <a href="#">
+          <span class="icon-checkmark-circle"></span>
+          <strong><%= t("admin.menu.title_polls") %></strong>
+        </a>
+        <ul id="polls_menu" <%= "class=is-active" if menu_polls? %>>
+          <li <%= 'class=active' if ["polls", "officer_assignments", "booth_assignments", "recounts", "results"].include? controller_name  %>>
+            <%= link_to t('admin.menu.polls'), admin_polls_path %>
+          </li>
+
+          <li <%= "class=active" if controller_name == "questions" %>>
+            <%= link_to t("admin.menu.poll_questions"), admin_questions_path %>
+          </li>
+
+          <li <%= 'class=active' if controller_name == 'officers' %>>
+            <%= link_to t('admin.menu.poll_officers'), admin_officers_path %>
+          </li>
+
+          <li <%= 'class=active' if controller_name == 'booths' %>>
+            <%= link_to t('admin.menu.poll_booths'), admin_booths_path %>
+          </li>
+        </ul>
       </li>
     <% end %>
 
     <% if feature?(:budgets) %>
-      <li <%= "class=active" if controller_name == "budgets" %>>
+      <li class="section-title" <%= "class=active" if controller_name == "budgets" %>>
         <%= link_to admin_budgets_path do %>
-          <span class="icon-budget"></span><%= t("admin.menu.budgets") %>
+          <span class="icon-budget"></span>
+          <strong><%= t("admin.menu.budgets") %></strong>
         <% end %>
       </li>
     <% end %>
 
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-organizations"></span>
+        <strong><%= t("admin.menu.title_profiles") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_profiles? %>>
+        <li <%= "class=active" if controller_name == "organizations" %>>
+          <%= link_to t("admin.menu.organizations"), admin_organizations_path %>
+        </li>
+
+        <li <%= "class=active" if controller_name == "officials" %>>
+          <%= link_to t("admin.menu.officials"), admin_officials_path %>
+        </li>
+
+        <li <%= 'class=active' if controller_name == 'moderators' %>>
+          <%= link_to t('admin.menu.moderators'), admin_moderators_path%>
+        </li>
+
+        <li <%= 'class=active' if controller_name == 'valuators' %>>
+          <%= link_to t('admin.menu.valuators'), admin_valuators_path %>
+        </li>
+
+        <li <%= 'class=active' if controller_name == 'managers' %>>
+          <%= link_to t('admin.menu.managers'), admin_managers_path %>
+        </li>
+      </ul>
+    </li>
+
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-banner"></span>
+        <strong><%= t("admin.menu.title_banners") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_banners? %>>
+        <li <%= "class=active" if controller_name == "banners" %>>
+          <%= link_to t("admin.menu.banner"), admin_banners_path %>
+        </li>
+      </ul>
+    </li>
+
+    <li class="section-title" <%= 'class=active' if controller_name == 'geozones' %>>
+      <%= link_to admin_geozones_path do %>
+        <strong><%= t('admin.menu.geozones') %></strong>
+      <% end %>
+    </li>
+
     <% if feature?(:signature_sheets) %>
-      <li <%= "class=active" if controller_name == "signature_sheets" %>>
+      <li class="section-title" <%= "class=active" if controller_name == "signature_sheets" %>>
         <%= link_to admin_signature_sheets_path do %>
-          <span class="icon-budget"></span><%= t("admin.menu.signature_sheets") %>
+          <strong><%= t("admin.menu.signature_sheets") %></strong>
         <% end %>
       </li>
     <% end %>
 
-    <li <%= "class=active" if controller_name == "banners" %>>
-      <%= link_to admin_banners_path do %>
-        <span class="icon-eye"></span><%= t("admin.menu.banner") %>
-      <% end %>
-    </li>
+    <li class="section-title">
+      <a href="#">
+        <span class="icon-settings"></span>
+        <strong><%= t("admin.menu.title_site_customization") %></strong>
+      </a>
+      <ul <%= "class=is-active" if menu_profiles? %>>
+        <li <%= "class=active" if controller_name == "pages" %>>
+          <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
+        </li>
 
-    <li <%= "class=active" if controller_name == "users" %>>
-      <%= link_to admin_users_path do %>
-        <span class="icon-eye"></span><%= t("admin.menu.hidden_users") %>
-      <% end %>
-    </li>
+        <li <%= "class=active" if controller_name == "images" %>>
+          <%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %>
+        </li>
 
-    <li <%= "class=active" if controller_name == "verifications" %>>
-      <%= link_to admin_verifications_path do %>
-        <span class="icon-eye"></span><%= t("admin.menu.incomplete_verifications") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "organizations" %>>
-      <%= link_to admin_organizations_path do %>
-        <span class="icon-organizations"></span><%= t("admin.menu.organizations") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "officials" %>>
-      <%= link_to admin_officials_path do %>
-        <span class="icon-user"></span><%= t("admin.menu.officials") %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'moderators' %>>
-      <%= link_to admin_moderators_path do %>
-        <span class="icon-user"></span><%= t('admin.menu.moderators') %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'valuators' %>>
-      <%= link_to admin_valuators_path do %>
-        <span class="icon-user"></span><%= t('admin.menu.valuators') %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'managers' %>>
-      <%= link_to admin_managers_path do %>
-        <span class="icon-user"></span><%= t('admin.menu.managers') %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'geozones' %>>
-      <%= link_to admin_geozones_path do %>
-        <span class="icon-settings"></span><%= t('admin.menu.geozones') %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'activity' %>>
-      <%= link_to admin_activity_path do %>
-        <span class="icon-eye"></span><%= t('admin.menu.activity') %>
-      <% end %>
-    </li>
-
-    <li <%= 'class=active' if controller_name == 'settings' %>>
-      <%= link_to admin_settings_path do %>
-        <span class="icon-settings"></span><%= t("admin.menu.settings") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "stats" %>>
-      <%= link_to admin_stats_path do %>
-        <span class="icon-stats"></span><%= t("admin.menu.stats") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "pages" %>>
-      <%= link_to admin_site_customization_pages_path do %>
-        <span class="icon-settings"></span><%= t("admin.menu.site_customization.pages") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "images" %>>
-      <%= link_to admin_site_customization_images_path do %>
-        <span class="icon-settings"></span><%= t("admin.menu.site_customization.images") %>
-      <% end %>
-    </li>
-
-    <li <%= "class=active" if controller_name == "content_blocks" %>>
-      <%= link_to admin_site_customization_content_blocks_path do %>
-        <span class="icon-settings"></span><%= t("admin.menu.site_customization.content_blocks") %>
-      <% end %>
+        <li <%= 'class=active' if controller_name == 'content_blocks' %>>
+          <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path%>
+        </li>
+      </ul>
     </li>
   </ul>
-</nav>
+</div>
diff --git a/app/views/admin/dashboard/index.html.erb b/app/views/admin/dashboard/index.html.erb
index 793b4e407..2a2ed1c56 100644
--- a/app/views/admin/dashboard/index.html.erb
+++ b/app/views/admin/dashboard/index.html.erb
@@ -1,4 +1,12 @@
-<%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'], root_path, class: "button float-right" %>
+<%= link_to admin_settings_path, class: "button float-right" do %>
+  <span class="icon-settings"></span>
+  <%= t("admin.menu.settings") %>
+<% end %>
+
+<%= link_to admin_stats_path, class: "button float-right" do %>
+  <span class="icon-stats"></span>
+  <%= t("admin.menu.stats") %>
+<% end %>
 
 <h2 class="inline-block"><%= t("admin.dashboard.index.title") %></h2>
 
diff --git a/app/views/admin/moderators/index.html.erb b/app/views/admin/moderators/index.html.erb
index d2a5d45e0..0fc8703fd 100644
--- a/app/views/admin/moderators/index.html.erb
+++ b/app/views/admin/moderators/index.html.erb
@@ -1,4 +1,6 @@
-<h2><%= t("admin.moderators.index.title") %></h2>
+<%= link_to t('admin.menu.activity'), admin_activity_path, class: "button hollow float-right" %>
+
+<h2 class="inline-block"><%= t("admin.moderators.index.title") %></h2>
 
 <div class="row">
   <%= form_tag search_admin_moderators_path, method: :get, remote: true  do %>
diff --git a/app/views/admin/poll/_menu.html.erb b/app/views/admin/poll/_menu.html.erb
new file mode 100644
index 000000000..08efd87dc
--- /dev/null
+++ b/app/views/admin/poll/_menu.html.erb
@@ -0,0 +1 @@
+<%= render "admin/menu" %>
\ No newline at end of file
diff --git a/app/views/admin/poll/booth_assignments/_search_booths.html.erb b/app/views/admin/poll/booth_assignments/_search_booths.html.erb
new file mode 100644
index 000000000..e96e334c7
--- /dev/null
+++ b/app/views/admin/poll/booth_assignments/_search_booths.html.erb
@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_booths_admin_poll_booth_assignments_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.booths_search.placeholder"), id: "search-booths" %>
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.booths_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div id="search-booths-results"></div>
diff --git a/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb
new file mode 100644
index 000000000..3fa7fc080
--- /dev/null
+++ b/app/views/admin/poll/booth_assignments/_search_booths_results.html.erb
@@ -0,0 +1,39 @@
+<% if @booths.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.shared.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.shared.search_results') %></h3>
+<% end %>
+
+<% if @booths.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.poll_booth_assignments.index.table_name") %></th>
+        <th><%= t("admin.poll_booth_assignments.index.table_location") %></th>
+        <th class="text-center"><%= t("admin.poll_booth_assignments.index.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @booths.each do |booth| %>
+      <tr>
+        <td>
+          <%= booth.name %>
+        </td>
+        <td>
+          <%= booth.location %>
+        </td>
+        <td class="text-center">
+          <% unless @poll.booth_ids.include?(booth.id) %>
+            <%= link_to t("admin.poll_booth_assignments.index.add_booth"),
+                          admin_poll_booth_assignments_path(@poll, booth_id: booth.id),
+                          method: :post,
+                          class: "button hollow" %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/booth_assignments/index.html.erb b/app/views/admin/poll/booth_assignments/index.html.erb
new file mode 100644
index 000000000..f14e59ef1
--- /dev/null
+++ b/app/views/admin/poll/booth_assignments/index.html.erb
@@ -0,0 +1,43 @@
+<%= render "/admin/poll/polls/poll_header" %>
+<div id="poll-resources">
+  <%= render "/admin/poll/polls/subnav" %>
+  <%= render "search_booths" %>
+
+  <h3><%= t("admin.poll_booth_assignments.index.booths_title") %></h3>
+
+  <% if @booth_assignments.empty? %>
+    <div class="callout primary margin-top">
+      <%= t("admin.poll_booth_assignments.index.no_booths") %>
+    </div>
+  <% else %>
+    <table id="assigned_booths_list" class="fixed margin">
+      <thead>
+        <th><%= t("admin.poll_booth_assignments.index.table_name") %></th>
+        <th><%= t("admin.poll_booth_assignments.index.table_location") %></th>
+        <th class="text-right"><%= t("admin.poll_booth_assignments.index.table_assignment") %></th>
+      </thead>
+      <tbody>
+        <% @booth_assignments.each do |booth_assignment| %>
+          <tr id="<%= dom_id(booth_assignment) %>" class="booth">
+            <td>
+              <strong>
+                <%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment) %>
+              </strong>
+            </td>
+            <td>
+              <%= booth_assignment.booth.location %>
+            </td>
+            <td class="text-right">
+              <%= link_to t("admin.poll_booth_assignments.index.remove_booth"),
+                          admin_poll_booth_assignment_path(@poll, booth_assignment),
+                          method: :delete,
+                          class: "button hollow alert" %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+
+    <%= paginate @booth_assignments %>
+  <% end %>
+</div>
diff --git a/app/views/admin/poll/booth_assignments/search_booths.js.erb b/app/views/admin/poll/booth_assignments/search_booths.js.erb
new file mode 100644
index 000000000..72fd96f68
--- /dev/null
+++ b/app/views/admin/poll/booth_assignments/search_booths.js.erb
@@ -0,0 +1 @@
+$("#search-booths-results").html("<%= j render 'search_booths_results' %>");
\ No newline at end of file
diff --git a/app/views/admin/poll/booth_assignments/show.html.erb b/app/views/admin/poll/booth_assignments/show.html.erb
new file mode 100644
index 000000000..519b36202
--- /dev/null
+++ b/app/views/admin/poll/booth_assignments/show.html.erb
@@ -0,0 +1,87 @@
+<%= link_to admin_poll_booth_assignments_path(@poll) do %>
+  <span class="icon-angle-left"></span>
+  <%= @poll.name %>
+<% end %>
+
+<h2><%= @booth_assignment.booth.name %></h2>
+
+<% if @booth_assignment.booth.location.present? %>
+  <p>
+    <strong><%= t("admin.poll_booth_assignments.show.location") %></strong>:
+    <%= @booth_assignment.booth.location %>
+  </p>
+<% end %>
+
+<div class="tabs-content" data-tabs-content="booths-tabs">
+  <ul class="tabs" data-tabs id="booths-tabs">
+    <li class="tabs-title is-active">
+      <%= link_to t("admin.poll_booth_assignments.show.officers"), "#tab-officers" %>
+    </li>
+    <li class="tabs-title">
+      <%= link_to t("admin.poll_booth_assignments.show.recounts"), "#tab-recounts" %>
+    </li>
+  </ul>
+
+  <div class="tabs-panel is-active" id="tab-officers">
+    <% if @booth_assignment.officers.empty? %>
+      <div class="callout primary margin-top">
+        <%= t("admin.poll_booth_assignments.show.no_officers") %>
+      </div>
+    <% else %>
+      <h3><%= t("admin.poll_booth_assignments.show.officers_list") %></h3>
+
+      <table id="officers_list">
+        <tbody>
+          <% @booth_assignment.officers.uniq.each do |officer| %>
+            <tr id="officer_<%= officer.id %>" class="officer">
+              <td><%= link_to officer.name, by_officer_admin_poll_officer_assignments_path(@poll, officer_id: officer.id) %></td>
+              <td><%= officer.email %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </div>
+
+  <div class="tabs-panel" id="tab-recounts">
+    <% if @booth_assignment.recounts.empty? %>
+      <div class="callout primary margin-top">
+        <%= t("admin.poll_booth_assignments.show.no_recounts") %>
+      </div>
+    <% else %>
+      <h3><%= t("admin.poll_booth_assignments.show.recounts_list") %></h3>
+      <table id="recounts_list">
+        <thead>
+          <tr>
+            <th><%= t("admin.poll_booth_assignments.show.date") %></th>
+            <th class="text-center"><%= t("admin.poll_booth_assignments.show.count_by_officer") %></th>
+            <th class="text-center"><%= t("admin.poll_booth_assignments.show.count_final") %></th>
+            <th class="text-center"><%= t("admin.poll_booth_assignments.show.count_by_system") %></th>
+          </tr>
+        </thead>
+        <tbody>
+        <% (@poll.starts_at.to_date..@poll.ends_at.to_date).each do |voting_date| %>
+          <% recount = recount_for_date(@booth_assignment.recounts, voting_date) %>
+          <% final_recount = final_recount_for_date(@booth_assignment.final_recounts, voting_date) %>
+          <% system_count = @voters_by_date[voting_date].present? ? @voters_by_date[voting_date].size : 0 %>
+          <tr id="recounting_<%= voting_date.strftime('%Y%m%d') %>">
+            <td><%= l voting_date %></td>
+            <% if recount.present? %>
+
+              <td class="text-center <%= 'count-error' if recount.count != system_count %>" title="<%= recount.officer_assignment.officer.name %>"><%= recount.count %></td>
+            <% else %>
+              <td class="text-center" title=""> - </td>
+            <% end %>
+            <% if final_recount.present? %>
+              <td class="text-center <%= 'count-error' if final_recount.count != system_count %>" title="<%= final_recount.officer_assignment.officer.name %>"><%= final_recount.count %></td>
+            <% else %>
+              <td class="text-center" title=""> - </td>
+            <% end %>
+            <td class="text-center"><%= system_count %></td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/admin/poll/booths/_booth.html.erb b/app/views/admin/poll/booths/_booth.html.erb
new file mode 100644
index 000000000..5732400a8
--- /dev/null
+++ b/app/views/admin/poll/booths/_booth.html.erb
@@ -0,0 +1,13 @@
+<tr id="booth_<%= booth.id %>" class="booth">
+  <td>
+    <%= booth.name %>
+  </td>
+  <td>
+    <%= booth.location %>
+  </td>
+  <td class="text-right">
+    <%= link_to t("admin.actions.edit"),
+                edit_admin_booth_path(booth),
+                class: "button hollow" %>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/app/views/admin/poll/booths/_form.html.erb b/app/views/admin/poll/booths/_form.html.erb
new file mode 100644
index 000000000..31d60c0f0
--- /dev/null
+++ b/app/views/admin/poll/booths/_form.html.erb
@@ -0,0 +1,20 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= f.text_field :name,
+                     placeholder: t('admin.booths.new.name'),
+                     label:       t("admin.booths.new.name") %>
+  </div>
+
+  <div class="small-12 column">
+    <%= f.text_field :location,
+                     placeholder: t("admin.booths.new.location"),
+                     label:       t("admin.booths.new.location") %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="small-12 medium-4 column">
+    <%= f.submit t("admin.booths.#{admin_submit_action(@booth)}.submit_button"),
+                 class: "button success expanded" %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/poll/booths/edit.html.erb b/app/views/admin/poll/booths/edit.html.erb
new file mode 100644
index 000000000..66bfa8355
--- /dev/null
+++ b/app/views/admin/poll/booths/edit.html.erb
@@ -0,0 +1,7 @@
+<%= back_link_to admin_booths_path %>
+
+<h2><%= t("admin.booths.edit.title") %></h2>
+
+<%= form_for @booth, url: admin_booth_path(@booth) do |f| %>
+  <%= render "form", f: f %>
+<% end %>
diff --git a/app/views/admin/poll/booths/index.html.erb b/app/views/admin/poll/booths/index.html.erb
new file mode 100644
index 000000000..9618aec59
--- /dev/null
+++ b/app/views/admin/poll/booths/index.html.erb
@@ -0,0 +1,28 @@
+<h2 class="inline-block"><%= t("admin.booths.index.title") %></h2>
+
+<%= link_to t("admin.booths.index.add_booth"), new_admin_booth_path,
+            class: "button success float-right" %>
+
+<% if @booths.empty? %>
+  <div class="callout primary">
+    <%= t("admin.booths.index.no_booths") %>
+  </div>
+<% end %>
+
+<% if @booths.any? %>
+  <h3><%= page_entries_info @booths %></h3>
+  <table>
+    <thead>
+      <th><%= t("admin.booths.index.name") %></th>
+      <th><%= t("admin.booths.index.location") %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+    <% @booths.each do |booth| %>
+      <%= render partial: "booth", locals: { booth: booth } %>
+    <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @booths %>
+<% end %>
diff --git a/app/views/admin/poll/booths/new.html.erb b/app/views/admin/poll/booths/new.html.erb
new file mode 100644
index 000000000..cf9581fa3
--- /dev/null
+++ b/app/views/admin/poll/booths/new.html.erb
@@ -0,0 +1,7 @@
+<%= back_link_to admin_booths_path %>
+
+<h2><%= t("admin.booths.new.title") %></h2>
+
+<%= form_for @booth, url: admin_booths_path(@booth) do |f| %>
+  <%= render "form", f: f %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/booths/show.html.erb b/app/views/admin/poll/booths/show.html.erb
new file mode 100644
index 000000000..bd9355f69
--- /dev/null
+++ b/app/views/admin/poll/booths/show.html.erb
@@ -0,0 +1,12 @@
+<%= back_link_to admin_booths_path %>
+
+<div class="clear"></div>
+
+<h2 class="inline-block">
+  <%= @booth.name %>
+</h2>
+
+<p>
+  <strong><%= t("admin.booths.show.location") %></strong>:
+  <%= @booth.location %>
+</p>
diff --git a/app/views/admin/poll/officer_assignments/_search_officers.html.erb b/app/views/admin/poll/officer_assignments/_search_officers.html.erb
new file mode 100644
index 000000000..7ed39f10d
--- /dev/null
+++ b/app/views/admin/poll/officer_assignments/_search_officers.html.erb
@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_officers_admin_poll_officer_assignments_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.poll_officers_search.placeholder"), id: "search-officers" %>
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.poll_officers_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div id="search-officers-results"></div>
diff --git a/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb b/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb
new file mode 100644
index 000000000..f665c6c0b
--- /dev/null
+++ b/app/views/admin/poll/officer_assignments/_search_officers_results.html.erb
@@ -0,0 +1,42 @@
+<% if @officers.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.shared.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.shared.search_results') %></h3>
+<% end %>
+
+<% if @officers.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.poll_officer_assignments.index.table_name") %></th>
+        <th><%= t("admin.poll_officer_assignments.index.table_email") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @officers.each do |user| %>
+      <tr>
+        <td>
+          <%= user.name %>
+        </td>
+        <td>
+          <%= user.email %>
+        </td>
+        <td class="text-center">
+        <% if @poll.officer_ids.include?(user.poll_officer.id) %>
+            <%= link_to t("admin.poll_officer_assignments.index.edit_officer_assignments"),
+                          by_officer_admin_poll_officer_assignments_path(@poll, officer_id: user.poll_officer.id),
+                          class: "button hollow alert" %>
+          <% else %>
+            <%= link_to t("admin.poll_officer_assignments.index.add_officer_assignments"),
+                          by_officer_admin_poll_officer_assignments_path(@poll, officer_id: user.poll_officer.id),
+                          class: "button hollow" %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/officer_assignments/by_officer.html.erb b/app/views/admin/poll/officer_assignments/by_officer.html.erb
new file mode 100644
index 000000000..205692535
--- /dev/null
+++ b/app/views/admin/poll/officer_assignments/by_officer.html.erb
@@ -0,0 +1,127 @@
+<%= link_to admin_poll_officer_assignments_path(@poll) do %>
+  <span class="icon-angle-left"></span>
+  <%= @poll.name %>
+<% end %>
+
+<h2><%= @officer.name %> - <%= @officer.email %></h2>
+
+<%= form_tag(admin_poll_officer_assignments_path(@poll), {id: "officer_assignment_form"}) do %>
+  <fieldset class="fieldset">
+    <legend><%= t("admin.poll_officer_assignments.by_officer.new_assignment") %></legend>
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.poll_officer_assignments.by_officer.date") %></label>
+      <%= select_tag :date,
+                      poll_dates_select_options(@poll) + poll_final_recount_option(@poll),
+                      { prompt: t("admin.poll_officer_assignments.by_officer.select_date"),
+                        label: false } %>
+    </div>
+
+    <div class="small-12 medium-4 column">
+      <label><%= t("admin.poll_officer_assignments.by_officer.booth") %></label>
+      <%= select_tag :booth_id,
+                      poll_booths_select_options(@poll),
+                      { prompt: t("admin.poll_officer_assignments.by_officer.select_booth"),
+                        label: false } %>
+    </div>
+
+    <div class="small-12 medium-4 column">
+      <%= hidden_field_tag :officer_id, @officer.id %>
+      <%= hidden_field_tag :poll_id, @poll.id %>
+      <%= submit_tag t("admin.poll_officer_assignments.by_officer.add_assignment"),
+                     class: "button expanded hollow margin-top" %>
+    </div>
+  </fieldset>
+<% end %>
+
+
+<% if @officer_assignments.empty? %>
+  <div class="callout primary margin-top">
+    <%= t("admin.poll_officer_assignments.by_officer.no_assignments") %>
+  </div>
+<% else %>
+  <h3><%= t("admin.poll_officer_assignments.by_officer.assignments") %></h3>
+  <table class="fixed">
+    <thead>
+      <tr>
+        <th><%= t("admin.poll_officer_assignments.by_officer.date") %></th>
+        <th><%= t("admin.poll_officer_assignments.by_officer.booth") %></th>
+        <th class="text-right"><%= t("admin.poll_officer_assignments.by_officer.assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @officer_assignments.each do |officer_assignment| %>
+        <tr id="<%= dom_id officer_assignment %>">
+          <td><%= officer_assignment.final? ? t('polls.final_date') : l(officer_assignment.date.to_date) %></td>
+          <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
+          <td class="text-right">
+            <%= link_to t("admin.poll_officer_assignments.by_officer.remove_assignment"),
+                        admin_poll_officer_assignment_path(@poll, officer_assignment),
+                        method: :delete,
+                        class: "button hollow alert" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
+
+<% voting_days_officer_assignments = @officer_assignments.select{|oa| oa.final == false} %>
+<% if voting_days_officer_assignments.any? %>
+  <h3><%= t("admin.poll_officer_assignments.by_officer.recounts") %></h3>
+  <table id="recount_list" class="fixed">
+    <thead>
+      <tr>
+        <th><%= t("admin.poll_officer_assignments.by_officer.date") %></th>
+        <th><%= t("admin.poll_officer_assignments.by_officer.booth") %></th>
+        <th class="text-right"><%= t("admin.poll_officer_assignments.by_officer.recount") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% voting_days_officer_assignments.each do |officer_assignment| %>
+        <tr id="recount_<%= officer_assignment.date.to_date.strftime('%Y%m%d') %>">
+          <td><%= l(officer_assignment.date.to_date) %></td>
+          <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
+          <td class="text-right">
+            <% if officer_assignment.recount.present? %>
+              <%= officer_assignment.recount.count %>
+            <% else %>
+              <span>-</span>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
+
+<% final_officer_assignments = @officer_assignments.select{|oa| oa.final == true} %>
+<% if final_officer_assignments.any? %>
+  <h3><%= t("admin.poll_officer_assignments.by_officer.final_recounts") %></h3>
+  <table id="final_recount_list" class="fixed">
+    <thead>
+      <tr>
+        <th><%= t("admin.poll_officer_assignments.by_officer.date") %></th>
+        <th><%= t("admin.poll_officer_assignments.by_officer.booth") %></th>
+        <th class="text-right"><%= t("admin.poll_officer_assignments.by_officer.final_recount") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% final_officer_assignments.each do |officer_assignment| %>
+          <tr id="final_recount_<%= officer_assignment.date.to_date.strftime('%Y%m%d') %>">
+            <td><%= l(officer_assignment.date.to_date) %></td>
+            <td><%= booth_name_with_location(officer_assignment.booth_assignment.booth) %></td>
+            <td class="text-right">
+              <% if officer_assignment.final_recounts.any? %>
+                <%= officer_assignment.final_recounts.to_a.sum(&:count) %>
+              <% else %>
+                <span>-</span>
+              <% end %>
+            </td>
+          </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
+
+
+
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
new file mode 100644
index 000000000..f6e75c602
--- /dev/null
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -0,0 +1,43 @@
+<%= render "/admin/poll/polls/poll_header" %>
+<div id="poll-resources">
+  <%= render "/admin/poll/polls/subnav" %>
+
+  <%= render "search_officers" %>
+
+  <h3><%= t("admin.poll_officer_assignments.index.officers_title") %></h3>
+
+  <% if @officers.empty? %>
+    <div class="callout primary margin-top">
+      <%= t("admin.poll_officer_assignments.index.no_officers") %>
+    </div>
+  <% else %>
+    <table class="fixed margin">
+      <thead>
+        <th><%= t("admin.poll_officer_assignments.index.table_name") %></th>
+        <th><%= t("admin.poll_officer_assignments.index.table_email") %></th>
+        <th class="text-right"><%= t("admin.actions.actions") %></th>
+      </thead>
+      <tbody>
+        <% @officers.each do |officer| %>
+          <tr id="officer_<%= officer.id %>" class="officer">
+            <td>
+              <strong>
+                <%= link_to officer.name, by_officer_admin_poll_officer_assignments_path(@poll, officer_id: officer.id) %>
+              </strong>
+            </td>
+            <td>
+              <%= officer.email %>
+            </td>
+            <td class="text-right">
+              <%= link_to t("admin.poll_officer_assignments.index.edit_officer_assignments"),
+                          by_officer_admin_poll_officer_assignments_path(@poll, officer_id: officer.id),
+                          class: "button hollow" %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+
+    <%= paginate @officers %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/poll/officer_assignments/search_officers.js.erb b/app/views/admin/poll/officer_assignments/search_officers.js.erb
new file mode 100644
index 000000000..ba621d8f7
--- /dev/null
+++ b/app/views/admin/poll/officer_assignments/search_officers.js.erb
@@ -0,0 +1 @@
+$("#search-officers-results").html("<%= j render 'search_officers_results' %>");
\ No newline at end of file
diff --git a/app/views/admin/poll/officers/_officer.html.erb b/app/views/admin/poll/officers/_officer.html.erb
new file mode 100644
index 000000000..80434f385
--- /dev/null
+++ b/app/views/admin/poll/officers/_officer.html.erb
@@ -0,0 +1,30 @@
+<table>
+  <thead>
+    <tr>
+      <th><%= t('admin.poll_officers.officer.name') %></th>
+      <th colspan="2"><%= t('admin.poll_officers.officer.email') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <%= officer.name %>
+      </td>
+      <td>
+        <%= officer.email %>
+      </td>
+      <td class="text-right">
+        <% if officer.persisted? %>
+          <%= link_to t('admin.poll_officers.officer.delete'),
+                      admin_poll_officer_path(officer),
+                      method: :delete,
+                      class: "button hollow alert" %>
+        <% else %>
+          <%= link_to t('admin.poll_officers.officer.add'),{ controller: "admin/poll/officers", action: :create, user_id: officer.user_id },
+                      method: :post,
+                      class: "button success" %>
+        <% end %>
+      </td>
+    </tr>
+  </tbody>
+</table>
diff --git a/app/views/admin/poll/officers/_search.html.erb b/app/views/admin/poll/officers/_search.html.erb
new file mode 100644
index 000000000..dda22dee2
--- /dev/null
+++ b/app/views/admin/poll/officers/_search.html.erb
@@ -0,0 +1,9 @@
+<%= form_tag search_admin_officers_path, method: :get, remote: true  do %>
+  <div class="input-group">
+    <%= text_field_tag :email, '',
+                       placeholder: t("admin.poll_officers.search.email_placeholder") %>
+    <div class="input-group-button">
+      <%= submit_tag t("admin.poll_officers.search.search"), class: "button" %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/admin/poll/officers/edit.html.erb b/app/views/admin/poll/officers/edit.html.erb
new file mode 100644
index 000000000..5c64d3aeb
--- /dev/null
+++ b/app/views/admin/poll/officers/edit.html.erb
@@ -0,0 +1 @@
+officer edit
\ No newline at end of file
diff --git a/app/views/admin/poll/officers/index.html.erb b/app/views/admin/poll/officers/index.html.erb
new file mode 100644
index 000000000..fd9619167
--- /dev/null
+++ b/app/views/admin/poll/officers/index.html.erb
@@ -0,0 +1,53 @@
+<h2><%= t("admin.poll_officers.index.title") %></h2>
+
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= render 'search' %>
+  </div>
+</div>
+
+<div id="search-result"></div>
+
+<h3>
+  <%= page_entries_info @officers, entry_name: t('admin.poll_officers.officer.entry_name') %>
+</h3>
+
+<% if @officers.any? %>
+  <table id="officers">
+    <thead>
+      <tr>
+        <th><%= t('admin.poll_officers.officer.name') %></th>
+        <th colspan="2"><%= t('admin.poll_officers.officer.email') %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @officers.each do |officer| %>
+      <tr>
+        <td>
+          <%= officer.name %>
+        </td>
+        <td>
+          <%= officer.email %>
+        </td>
+        <td class="text-right">
+          <% if officer.persisted? %>
+            <%= link_to t('admin.poll_officers.officer.delete'),
+                        admin_officer_path(officer),
+                        method: :delete,
+                        class: "button hollow alert"
+            %>
+          <% else %>
+            <%= link_to t('admin.poll_officers.officer.add'),
+                        { controller: "admin/poll/officers", action: :create,
+                          user_id: officer.user_id },
+                        method: :post,
+                        class: "button success" %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @officers %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/officers/search.js.erb b/app/views/admin/poll/officers/search.js.erb
new file mode 100644
index 000000000..bd259f7fb
--- /dev/null
+++ b/app/views/admin/poll/officers/search.js.erb
@@ -0,0 +1 @@
+$("#search-result").html("<%= j render 'officer',  officer: @officer %>");
diff --git a/app/views/admin/poll/officers/show.html.erb b/app/views/admin/poll/officers/show.html.erb
new file mode 100644
index 000000000..fc702276e
--- /dev/null
+++ b/app/views/admin/poll/officers/show.html.erb
@@ -0,0 +1 @@
+officer show
\ No newline at end of file
diff --git a/app/views/admin/poll/officers/user_not_found.js.erb b/app/views/admin/poll/officers/user_not_found.js.erb
new file mode 100644
index 000000000..a6444dc61
--- /dev/null
+++ b/app/views/admin/poll/officers/user_not_found.js.erb
@@ -0,0 +1 @@
+$("#search-result").html("<div class=\"callout alert\"><%= j t('admin.poll_officers.search.user_not_found') %></div>");
diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
new file mode 100644
index 000000000..0b99ea9f5
--- /dev/null
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -0,0 +1,46 @@
+<%= form_for [:admin, @poll] do |f| %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= f.text_field :name %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= f.text_field :starts_at,
+                        value: @poll.starts_at.present? ? l(@poll.starts_at.to_date) : nil,
+                        class: "js-calendar-full" %>
+    </div>
+
+    <div class="small-12 medium-6 column">
+      <%= f.text_field :ends_at,
+                        value: @poll.ends_at.present? ? l(@poll.ends_at.to_date) : nil,
+                        class: "js-calendar-full" %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="small-6 medium-6 column">
+      <%= f.check_box :geozone_restricted, data: { checkbox_toggle: "#geozones" } %>
+    </div>
+  </div>
+
+  <div id="geozones" style="<%= @poll.geozone_restricted? ? '' : 'display:none' %>">
+    <div class="row">
+      <%= f.collection_check_boxes(:geozone_ids, @geozones, :id, :name) do |b| %>
+        <div class="small-6 medium-3 column">
+          <%= b.label do %>
+            <%= b.check_box + b.text %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="small-12 medium-4 column">
+      <%= f.submit t("admin.polls.#{admin_submit_action(@poll)}.submit_button"),
+                   class: "button success expanded" %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/admin/poll/polls/_poll.html.erb b/app/views/admin/poll/polls/_poll.html.erb
new file mode 100644
index 000000000..b65ce3e71
--- /dev/null
+++ b/app/views/admin/poll/polls/_poll.html.erb
@@ -0,0 +1,18 @@
+<tr id="<%= dom_id(poll) %>" class="poll">
+  <td>
+    <strong>
+      <%= link_to poll.name, admin_poll_path(poll) %>
+    </strong>
+  </td>
+  <td>
+    <%= l poll.starts_at.to_date %> - <%= l poll.ends_at.to_date %>
+  </td>
+  <td>
+    <%= link_to t("admin.actions.edit"),
+                edit_admin_poll_path(poll),
+                class: "button hollow" %>
+    <%= link_to t("admin.actions.configure"),
+                admin_poll_path(poll),
+                class: "button hollow" %>
+  </td>
+</tr>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/_poll_header.html.erb b/app/views/admin/poll/polls/_poll_header.html.erb
new file mode 100644
index 000000000..a88dd03ee
--- /dev/null
+++ b/app/views/admin/poll/polls/_poll_header.html.erb
@@ -0,0 +1,17 @@
+<%= link_to t("admin.actions.edit"),
+            edit_admin_poll_path(@poll),
+            class: "button hollow float-right" %>
+
+<h2 class="inline-block">
+  <%= @poll.name %>
+</h2>
+<br>
+<span>
+  (<%= l @poll.starts_at.to_date %> - <%= l @poll.ends_at.to_date %>)
+</span>
+<% if @poll.geozone_restricted %>
+  <span class="bullet">&nbsp;&bull;&nbsp;</span>
+  <span>
+    <%= @poll.geozones.pluck(:name).to_sentence %>
+  <span>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/_questions.html.erb b/app/views/admin/poll/polls/_questions.html.erb
new file mode 100644
index 000000000..e41d2017e
--- /dev/null
+++ b/app/views/admin/poll/polls/_questions.html.erb
@@ -0,0 +1,31 @@
+<h3><%= t("admin.polls.show.questions_title") %></h3>
+
+<% if @poll.questions.empty? %>
+  <div class="callout primary margin-top">
+    <%= t('admin.polls.show.no_questions') %>
+  </div>
+<% else %>
+  <table class="fixed margin">
+    <thead>
+      <tr>
+        <th><%= t('admin.polls.show.table_title') %></th>
+        <th class="text-right"><%= t('admin.polls.show.table_assignment') %></th>
+      </tr>
+    </thead>
+    <% @poll.questions.each do |question| %>
+      <tr id="<%= dom_id(question) %>">
+        <td>
+          <strong>
+            <%= link_to question.title, admin_question_path(question) %>
+          </strong>
+        </td>
+        <td class="text-right">
+          <%= link_to t('admin.polls.show.remove_question'),
+                      remove_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
+                      class: "button hollow alert",
+                      method: :patch %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_search_questions.html.erb b/app/views/admin/poll/polls/_search_questions.html.erb
new file mode 100644
index 000000000..659cdcd37
--- /dev/null
+++ b/app/views/admin/poll/polls/_search_questions.html.erb
@@ -0,0 +1,17 @@
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= form_tag(search_questions_admin_poll_path(@poll), method: :get, remote: true) do |f| %>
+      <div class="input-group">
+        <%= text_field_tag :search,
+                           @search,
+                           placeholder: t("admin.shared.poll_questions_search.placeholder"), id: "search-questions" %>
+
+        <div class="input-group-button">
+          <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<div id="search-questions-results"></div>
diff --git a/app/views/admin/poll/polls/_search_questions_results.html.erb b/app/views/admin/poll/polls/_search_questions_results.html.erb
new file mode 100644
index 000000000..f6f11e1f1
--- /dev/null
+++ b/app/views/admin/poll/polls/_search_questions_results.html.erb
@@ -0,0 +1,33 @@
+<% if @questions.blank? %>
+  <div class="callout alert margin-bottom">
+    <%= t('admin.shared.no_search_results') %>
+  </div>
+<% else %>
+  <h3><%= t('admin.shared.search_results') %></h3>
+<% end %>
+
+<% if @questions.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("admin.polls.show.table_name") %></th>
+        <th class="text-center"><%= t("admin.polls.show.table_assignment") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @questions.each do |question| %>
+      <tr>
+        <td>
+          <%= question.title %>
+        </td>
+        <td class="text-center">
+          <%= link_to t("admin.polls.show.add_question"),
+                        add_question_admin_poll_path(poll_id: @poll.id, question_id: question.id),
+                        method: :patch,
+                        class: "button hollow" %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/admin/poll/polls/_subnav.html.erb b/app/views/admin/poll/polls/_subnav.html.erb
new file mode 100644
index 000000000..249ff407c
--- /dev/null
+++ b/app/views/admin/poll/polls/_subnav.html.erb
@@ -0,0 +1,63 @@
+<ul class="menu simple clear" id="assigned-resources-tabs">
+  <% if controller_name == "polls" %>
+    <li class="active">
+        <%= t("admin.polls.show.questions_tab") %>
+        (<%= @poll.questions.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_path(@poll) do %>
+        <%= t("admin.polls.show.questions_tab") %>
+        (<%= @poll.questions.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "booth_assignments" %>
+    <li class="active">
+      <%= t("admin.polls.show.booths_tab") %>
+      (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_booth_assignments_path(@poll) do %>
+        <%= t("admin.polls.show.booths_tab") %>
+        (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "officer_assignments" %>
+    <li class="active">
+      <%= t("admin.polls.show.officers_tab") %>
+      (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
+    </li>
+  <% else %>
+    <li>
+      <%= link_to admin_poll_officer_assignments_path(@poll) do %>
+        <%= t("admin.polls.show.officers_tab") %>
+        (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
+      <% end %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "recounts" %>
+    <li class="active">
+      <%= t("admin.polls.show.recounts_tab") %>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.polls.show.recounts_tab"), admin_poll_recounts_path(@poll) %>
+    </li>
+  <% end %>
+
+  <% if controller_name == "results" %>
+    <li class="active">
+      <%= t("admin.polls.show.results_tab") %>
+    </li>
+  <% else %>
+    <li>
+      <%= link_to t("admin.polls.show.results_tab"), admin_poll_results_path(@poll) %>
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/admin/poll/polls/edit.html.erb b/app/views/admin/poll/polls/edit.html.erb
new file mode 100644
index 000000000..cf131203f
--- /dev/null
+++ b/app/views/admin/poll/polls/edit.html.erb
@@ -0,0 +1,5 @@
+<%= render 'shared/back_link' %>
+
+<h2><%= t("admin.polls.edit.title") %></h2>
+
+<%= render "form" %>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/index.html.erb b/app/views/admin/poll/polls/index.html.erb
new file mode 100644
index 000000000..5bd310e54
--- /dev/null
+++ b/app/views/admin/poll/polls/index.html.erb
@@ -0,0 +1,22 @@
+<h2 class="inline-block"><%= t("admin.polls.index.title") %></h2>
+
+<%= link_to t("admin.polls.index.create"),
+            new_admin_poll_path,
+            class: "button success float-right" %>
+
+<% if @polls.any? %>
+  <table class="fixed">
+    <thead>
+      <th><%= t("admin.polls.index.name") %></th>
+      <th><%= t("admin.polls.index.dates") %></th>
+      <th><%= t("admin.actions.actions") %></th>
+    </thead>
+    <tbody>
+      <%= render @polls %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.polls.index.no_polls") %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/new.html.erb b/app/views/admin/poll/polls/new.html.erb
new file mode 100644
index 000000000..ba1ae7260
--- /dev/null
+++ b/app/views/admin/poll/polls/new.html.erb
@@ -0,0 +1,5 @@
+<%= render 'shared/back_link' %>
+
+<h2><%= t("admin.polls.new.title") %></h2>
+
+<%= render "form" %>
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/search_questions.js.erb b/app/views/admin/poll/polls/search_questions.js.erb
new file mode 100644
index 000000000..05f5c5167
--- /dev/null
+++ b/app/views/admin/poll/polls/search_questions.js.erb
@@ -0,0 +1 @@
+$("#search-questions-results").html("<%= j render 'search_questions_results' %>");
\ No newline at end of file
diff --git a/app/views/admin/poll/polls/show.html.erb b/app/views/admin/poll/polls/show.html.erb
new file mode 100644
index 000000000..93ce52e47
--- /dev/null
+++ b/app/views/admin/poll/polls/show.html.erb
@@ -0,0 +1,8 @@
+<%= render "poll_header" %>
+
+<div id="poll-resources">
+  <%= render "subnav" %>
+
+  <%= render "search_questions" %>
+  <%= render "questions" %>
+</div>
diff --git a/app/views/admin/poll/questions/_filter.html.erb b/app/views/admin/poll/questions/_filter.html.erb
new file mode 100644
index 000000000..0fd800067
--- /dev/null
+++ b/app/views/admin/poll/questions/_filter.html.erb
@@ -0,0 +1,7 @@
+<%= form_tag '', method: :get do %>
+  <%= label_tag :poll_id, t("admin.questions.index.filter_poll") %>
+  <%= select_tag "poll_id",
+                 poll_select_options(true),
+                 prompt: t("admin.questions.index.select_poll"),
+                 class: "js-location-changer" %>
+<% end %>
diff --git a/app/views/admin/poll/questions/_filter_subnav.html.erb b/app/views/admin/poll/questions/_filter_subnav.html.erb
new file mode 100644
index 000000000..7f641d390
--- /dev/null
+++ b/app/views/admin/poll/questions/_filter_subnav.html.erb
@@ -0,0 +1,12 @@
+<ul class="tabs" data-tabs id="questions-tabs">
+  <li class="tabs-title is-active">
+    <%= link_to "#tab-questions" do %>
+      <%= t("admin.questions.index.questions_tab") %>
+    <% end %>
+  </li>
+  <li class="tabs-title">
+    <%= link_to "#tab-successful-proposals" do %>
+      <%= t("admin.questions.index.successful_proposals_tab") %>
+    <% end %>
+  </li>
+</ul>
diff --git a/app/views/admin/poll/questions/_form.html.erb b/app/views/admin/poll/questions/_form.html.erb
new file mode 100644
index 000000000..0da36913a
--- /dev/null
+++ b/app/views/admin/poll/questions/_form.html.erb
@@ -0,0 +1,37 @@
+<%= form_for(@question, url: form_url) do |f| %>
+
+  <%= render 'shared/errors', resource: @question %>
+
+  <%= f.hidden_field :proposal_id %>
+
+  <div class="row">
+
+    <div class="small-12 column">
+      <div class="small-12 medium-6 large-4">
+        <%= f.select :poll_id,
+                      options_for_select(Poll.pluck(:name, :id)),
+                      prompt: t("admin.questions.index.select_poll"),
+                      label: t("admin.questions.new.poll_label") %>
+      </div>
+
+      <%= f.text_field :title, maxlength: Poll::Question.title_max_length %>
+
+      <%= f.label :valid_answers %>
+      <p class="note"><%= t("admin.questions.new.valid_answers_note") %></p>
+      <%= f.text_field :valid_answers, label: false %>
+
+      <div class="ckeditor">
+        <%= f.cktext_area :description,
+                          maxlength: Poll::Question.description_max_length,
+                          ckeditor: { language: I18n.locale } %>
+      </div>
+
+      <div class="row">
+        <div class="actions small-12 medium-4 column margin-top">
+          <%= f.submit(class: "button expanded", value: t("shared.save")) %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<% end %>
diff --git a/app/views/admin/poll/questions/_questions.html.erb b/app/views/admin/poll/questions/_questions.html.erb
new file mode 100644
index 000000000..c142ad084
--- /dev/null
+++ b/app/views/admin/poll/questions/_questions.html.erb
@@ -0,0 +1,31 @@
+<div class="small-12 medium-4 large-3">
+  <%= render 'filter' %>
+</div>
+
+<% if @questions.count == 0 %>
+  <div class="callout primary margin-top">
+    <%= t('admin.questions.index.no_questions') %>
+  </div>
+<% else %>
+  <table class="fixed">
+    <thead>
+      <tr>
+        <th><%= t('admin.questions.index.table_question') %></th>
+        <th class="text-right"><%= t("admin.actions.actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @questions.each do |question| %>
+        <tr id="<%= dom_id(question) %>">
+          <td><%= link_to question.title, admin_question_path(question) %></td>
+          <td class="text-right">
+            <%= link_to t('shared.edit'), edit_admin_question_path(question), class: "button hollow" %>
+            <%= link_to t('shared.delete'), admin_question_path(question), class: "button hollow alert", method: :delete %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= paginate @questions %>
+<% end %>
diff --git a/app/views/admin/poll/questions/_search.html.erb b/app/views/admin/poll/questions/_search.html.erb
new file mode 100644
index 000000000..e8a2c52c5
--- /dev/null
+++ b/app/views/admin/poll/questions/_search.html.erb
@@ -0,0 +1,10 @@
+<%= form_tag(admin_questions_path, method: :get) do |f| %>
+  <div class="input-group">
+    <%= text_field_tag :search,
+                       @search,
+                       placeholder: t("admin.shared.poll_questions_search.placeholder") %>
+    <div class="input-group-button">
+      <%= submit_tag t("admin.shared.poll_questions_search.button"), class: "button" %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/admin/poll/questions/_successful_proposals.html.erb b/app/views/admin/poll/questions/_successful_proposals.html.erb
new file mode 100644
index 000000000..2b192bccd
--- /dev/null
+++ b/app/views/admin/poll/questions/_successful_proposals.html.erb
@@ -0,0 +1,26 @@
+<table class="fixed">
+  <thead>
+    <tr>
+      <th><%= t('admin.questions.index.table_proposal') %></th>
+      <th class="text-right"><%= t("admin.actions.actions") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @proposals.each do |proposal| %>
+      <tr id="<%= dom_id(proposal) %>">
+        <td>
+          <%= link_to proposal.title, proposal_path(proposal) %>
+          <p>
+            <%= proposal.summary %><br>
+            <strong><%= proposal.question %></strong>
+          </p>
+        </td>
+        <td class="text-right">
+          <%= link_to t("admin.questions.index.create_question"),
+                new_admin_question_path(proposal_id: proposal.id),
+                class: "button hollow" %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/admin/poll/questions/edit.html.erb b/app/views/admin/poll/questions/edit.html.erb
new file mode 100644
index 000000000..6c4d24adf
--- /dev/null
+++ b/app/views/admin/poll/questions/edit.html.erb
@@ -0,0 +1,5 @@
+<%= render "shared/back_link" %>
+
+<h2><%= t("admin.questions.edit.title") %></h2>
+
+<%= render "form", form_url: admin_question_path(@question) %>
\ No newline at end of file
diff --git a/app/views/admin/poll/questions/index.html.erb b/app/views/admin/poll/questions/index.html.erb
new file mode 100644
index 000000000..f45497af0
--- /dev/null
+++ b/app/views/admin/poll/questions/index.html.erb
@@ -0,0 +1,22 @@
+<h2 class="inline-block"><%= t('admin.questions.index.title') %></h2>
+
+<%= link_to t('admin.questions.index.create'), new_admin_question_path,
+            class: "button success float-right" %>
+
+<div class="row">
+  <div class="small-12 medium-6 column">
+    <%= render 'search' %>
+  </div>
+</div>
+
+<div class="tabs-content" data-tabs-content="questions-tabs">
+  <%= render "filter_subnav" %>
+
+  <div class="tabs-panel is-active" id="tab-questions">
+    <%= render "questions" %>
+  </div>
+
+  <div class="tabs-panel" id="tab-successful-proposals">
+    <%= render "successful_proposals" %>
+  </div>
+</div>
diff --git a/app/views/admin/poll/questions/new.html.erb b/app/views/admin/poll/questions/new.html.erb
new file mode 100644
index 000000000..830492d6d
--- /dev/null
+++ b/app/views/admin/poll/questions/new.html.erb
@@ -0,0 +1,5 @@
+<%= render "shared/back_link" %>
+
+<h2><%= t("admin.questions.new.title") %></h2>
+
+<%= render "form", form_url: admin_questions_path %>
\ No newline at end of file
diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb
new file mode 100644
index 000000000..a8f25f2bd
--- /dev/null
+++ b/app/views/admin/poll/questions/show.html.erb
@@ -0,0 +1,46 @@
+<%= render "shared/back_link" %>
+
+<%= link_to t('shared.edit'), edit_admin_question_path(@question),
+            class: "button hollow float-right" %>
+
+<div class="clear"></div>
+
+<div class="row">
+  <div class="small-12 medium-9 column">
+    <strong><%= t("admin.questions.show.title") %></strong>
+    <h1><%= @question.title %></h1>
+
+    <% if @question.proposal.present? %>
+      <p>
+        <strong><%= t("admin.questions.show.proposal") %></strong>
+        <br>
+        <%= link_to @question.proposal.title, proposal_path(@question.proposal) %>
+      </p>
+    <% end %>
+
+    <p>
+      <strong><%= t("admin.questions.show.author") %></strong>
+      <br>
+      <%= link_to @question.author.name, user_path(@question.author) %>
+    </p>
+
+    <p>
+      <strong><%= t("admin.questions.show.valid_answers") %></strong>
+    </p>
+
+    <% @question.valid_answers.each do |answer| %>
+      <span class="button">
+        <%= answer %>
+      </span>
+    <% end %>
+
+    <p>
+      <strong><%= t("admin.questions.show.description") %></strong>
+      <br>
+      <%= @question.description %>
+    </p>
+
+
+    <%= link_to t("admin.questions.show.preview"), question_path(@question) %>
+  </div>
+</div>
diff --git a/app/views/admin/poll/recounts/index.html.erb b/app/views/admin/poll/recounts/index.html.erb
new file mode 100644
index 000000000..98055f553
--- /dev/null
+++ b/app/views/admin/poll/recounts/index.html.erb
@@ -0,0 +1,58 @@
+<%= render "/admin/poll/polls/poll_header" %>
+<div id="poll-resources">
+  <%= render "/admin/poll/polls/subnav" %>
+
+  <h3><%= t("admin.recounts.index.title") %></h3>
+
+  <% if @booth_assignments.empty? %>
+    <div class="callout primary margin-top">
+      <%= t("admin.recounts.index.no_recounts") %>
+    </div>
+  <% else %>
+    <table class="fixed margin">
+      <thead>
+        <th><%= t("admin.recounts.index.table_booth_name") %></th>
+        <th class="text-center"><%= t("admin.recounts.index.table_recounts") %></th>
+        <th class="text-center"><%= t("admin.recounts.index.table_final_recount") %></th>
+        <th class="text-center"><%= t("admin.recounts.index.table_system_count") %></th>
+      </thead>
+      <tbody>
+        <% @booth_assignments.each do |booth_assignment| %>
+          <% recount = booth_assignment_sum_recounts(booth_assignment) %>
+          <% final_recount = booth_assignment_sum_final_recounts(booth_assignment) %>
+          <% system_count = booth_assignment.voters.size %>
+          <tr id="<%= dom_id(booth_assignment) %>_recounts" class="booth_recounts">
+            <td>
+              <strong>
+                <%= link_to booth_assignment.booth.name, admin_poll_booth_assignment_path(@poll, booth_assignment, anchor: 'tab-recounts') %>
+              </strong>
+            </td>
+            <td class="text-center <%= 'count-error' if recount.to_i != system_count %>">
+              <% if recount.present? %>
+                <%= recount %>
+              <% else %>
+                <span>-</span>
+              <% end %>
+            </td>
+            <td class="text-center <%= 'count-error' if final_recount.to_i != system_count %>">
+              <% if final_recount.present? %>
+                <strong><%= final_recount %></strong>
+              <% else %>
+                <span>-</span>
+              <% end %>
+            </td>
+            <td class="text-center">
+              <% if system_count.present? %>
+                <strong><%= system_count %></strong>
+              <% else %>
+                <span>0</span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+
+    <%= paginate @booth_assignments %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/poll/results/index.html.erb b/app/views/admin/poll/results/index.html.erb
new file mode 100644
index 000000000..9d3a6abef
--- /dev/null
+++ b/app/views/admin/poll/results/index.html.erb
@@ -0,0 +1,50 @@
+<%= render "/admin/poll/polls/poll_header" %>
+<div id="poll-resources">
+  <%= render "/admin/poll/polls/subnav" %>
+
+  <h3><%= t("admin.results.index.title") %></h3>
+
+  <% if @partial_results.empty? %>
+    <div class="callout primary margin-top">
+      <%= t("admin.results.index.no_results") %>
+    </div>
+  <% else %>
+
+    <table class="margin">
+      <thead>
+        <th><%= t("admin.results.index.table_whites") %></th>
+        <th><%= t("admin.results.index.table_nulls") %></th>
+      </thead>
+      <tbody>
+        <tr>
+          <td id="white_results"><%= @poll.white_results.sum(:amount) %></td>
+          <td id="null_results"><%= @poll.null_results.sum(:amount) %></td>
+        </tr>
+      </tbody>
+    </table>
+
+
+    <% by_question = @partial_results.group_by(&:question_id) %>
+    <% @poll.questions.each do |question| %>
+      <h3><%= question.title %></h3>
+      <table class="margin">
+        <thead>
+          <tr>
+            <th><%= t("admin.results.index.table_answer") %></th>
+            <th class="text-center"><%= t("admin.results.index.table_votes") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% question.valid_answers.each_with_index do |answer, i| %>
+            <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %>
+            <tr id="question_<%= question.id %>_<%= i %>_result">
+              <td><%= answer %></td>
+              <td class="text-center"><%= by_answer[answer].present? ? by_answer[answer].sum(&:amount) : 0 %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% end %>
+
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/site_customization/pages/_form.html.erb b/app/views/admin/site_customization/pages/_form.html.erb
index 3881885d2..197520631 100644
--- a/app/views/admin/site_customization/pages/_form.html.erb
+++ b/app/views/admin/site_customization/pages/_form.html.erb
@@ -41,7 +41,7 @@
       <h4><%= f.label :status %></h4>
       <% ::SiteCustomization::Page::VALID_STATUSES.each do |status| %>
         <%= f.radio_button :status, status, label: false %>
-        <%= f.label "status_#{status}", t("admin.site_customization.pages.status_#{status}") %>
+        <%= f.label "status_#{status}", t("admin.site_customization.pages.page.status_#{status}") %>
         <br/>
       <% end %>
 
diff --git a/app/views/admin/stats/show.html.erb b/app/views/admin/stats/show.html.erb
index ef17536c3..cd83201a4 100644
--- a/app/views/admin/stats/show.html.erb
+++ b/app/views/admin/stats/show.html.erb
@@ -11,7 +11,8 @@
                     direct_messages_admin_stats_path, class: "button hollow" %>
         <%= link_to t("admin.stats.show.proposal_notifications"),
                     proposal_notifications_admin_stats_path, class: "button hollow" %>
-
+        <%= link_to t("admin.stats.show.incomplete_verifications"),
+                     admin_verifications_path, class: "button hollow" %>
       </div>
 
       <div class="clear"></div>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 45d27bd56..e38c52233 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -31,11 +31,11 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% if @proposal_successfull_exists %>
-        <%= render "proposals/proposal_ballots_banner" %>
+      <% if @proposal_successful_exists %>
+        <%= render "proposals/successful_banner" %>
       <% end %>
 
-      <% unless @tag_filter || @search_terms || !has_featured? || @proposal_ballots.present? || @proposal_successfull_exists %>
+      <% unless @tag_filter || @search_terms || !has_featured? || @proposal_successful_exists %>
         <%= render "featured_debates" %>
       <% end %>
 
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 72617386c..8597b41de 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -1,14 +1,16 @@
 <header>
-  <section class="top-links">
+  <div class="top-links">
     <div class="expanded row">
       <%= render 'shared/locale_switcher' %>
+      <%= link_to t("admin.dashboard.index.back") + " " + setting['org_name'],
+                  root_path, class: "float-right back-web" %>
     </div>
-  </section>
+  </div>
 
   <div class="expanded row">
     <div class="top-bar">
 
-      <%= link_to setting['org_name'], admin_root_path, class: "logo show-for-small-only" %>
+      <%= link_to setting['org_name'], namespaced_root_path, class: "logo show-for-small-only" %>
 
       <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
         <span class="menu-icon dark" data-toggle></span>
@@ -17,11 +19,13 @@
 
       <div id="responsive-menu">
         <div class="top-bar-title">
-          <%= link_to admin_root_path, class: "hide-for-small-only" do %>
-            <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
-            <%= setting['org_name'] %>
-            &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
-          <% end %>
+          <h1>
+            <%= link_to namespaced_root_path, class: "hide-for-small-only" do %>
+              <%= image_tag(image_path_for('logo_header.png'), class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+              <%= setting['org_name'] %>
+              &nbsp;|&nbsp;<%= namespaced_header_title %>
+            <% end %>
+          </h1>
         </div>
 
         <div class="top-bar-right">
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 95bcae3e3..198bf3adf 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -30,7 +30,7 @@
         <div class="off-canvas-content" data-off-canvas-content>
           <%= render 'layouts/admin_header' %>
 
-          <main class="no-margin-top row no-max-width collapse">
+          <div class="no-margin-top row no-max-width collapse" data-equalizer>
             <div class="small-12 medium-3 column">
 
               <div class="show-for-small-only">
@@ -42,11 +42,11 @@
               </div>
             </div>
 
-            <div class="admin-content small-12 medium-9 column">
+            <div class="admin-content small-12 medium-9 column" data-equalizer-watch>
               <%= render 'layouts/flash' %>
               <%= yield %>
             </div>
-          </main>
+          </div>
         </div>
       </div>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7ae505aad..7f66b524e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -27,7 +27,7 @@
 
     <h1 class="sr-only"><%= setting['org_name'] %></h1>
 
-    <div class="wrapper">
+    <div class="wrapper <%= yield (:wrapper_class) %>">
       <%= render 'layouts/header' %>
 
       <!--[if lt IE 9]>
diff --git a/app/views/officing/_menu.html.erb b/app/views/officing/_menu.html.erb
new file mode 100644
index 000000000..2d0d93cbd
--- /dev/null
+++ b/app/views/officing/_menu.html.erb
@@ -0,0 +1,25 @@
+<div class="admin-sidebar" data-equalizer-watch>
+  <ul id="officing_menu">
+
+    <li <%= "class=active" if controller_name == "voters" %>>
+      <%= link_to new_officing_residence_path do %>
+        <span class="icon-user"></span>
+        <%= t("officing.menu.voters") %>
+      <% end %>
+    </li>
+
+    <li <%= "class=active" if ["recounts"].include?(controller_name) || (controller_name == "polls" && action_name == "index") %>>
+      <%= link_to officing_polls_path do %>
+        <span class="icon-user"></span>
+        <%= t("officing.menu.recounts") %>
+      <% end %>
+    </li>
+
+    <li <%= "class=active" if ["final_recounts", "results"].include?(controller_name) || (controller_name == "polls" && action_name == "final") %>>
+      <%= link_to final_officing_polls_path do %>
+        <span class="icon-user"></span>
+        <%= t("officing.menu.final_recounts") %>
+      <% end %>
+    </li>
+  </ul>
+</div>
diff --git a/app/views/officing/dashboard/index.html.erb b/app/views/officing/dashboard/index.html.erb
new file mode 100644
index 000000000..861a39b1a
--- /dev/null
+++ b/app/views/officing/dashboard/index.html.erb
@@ -0,0 +1,5 @@
+<div class="dashboard">
+  <h2><%= t("officing.dashboard.index.title") %></h2>
+
+  <p><%= t("officing.dashboard.index.info") %></p>
+</div>
diff --git a/app/views/officing/final_recounts/new.html.erb b/app/views/officing/final_recounts/new.html.erb
new file mode 100644
index 000000000..647bd31b4
--- /dev/null
+++ b/app/views/officing/final_recounts/new.html.erb
@@ -0,0 +1,80 @@
+<% if @officer_assignments.any? %>
+  <h2><%= t("officing.final_recounts.new.title", poll: @poll.name) %></h2>
+
+  <%= form_tag(officing_poll_final_recounts_path(@poll), {id: "officer_assignment_form"}) do %>
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <label><%= t("officing.final_recounts.new.booth") %></label>
+        <%= select_tag :officer_assignment_id,
+                        booths_for_officer_select_options(@officer_assignments),
+                        { prompt: t("officing.final_recounts.new.select_booth"),
+                          label: false } %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <label><%= t("officing.final_recounts.new.date") %></label>
+        <%= select_tag :date,
+                        poll_dates_select_options(@poll),
+                        { prompt: t("officing.final_recounts.new.select_date"),
+                          label: false } %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-4 column">
+        <label><%= t("officing.final_recounts.new.count") %></label>
+        <%= text_field_tag :count, nil, placeholder: t("officing.final_recounts.new.count_placeholder") %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-4 column">
+        <%= submit_tag t("officing.final_recounts.new.submit"), class: "button expanded" %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <h2><%= @poll.name %></h2>
+  <div class="callout alert">
+    <%= t("officing.final_recounts.new.not_allowed") %>
+  </div>
+<% end %>
+
+
+<% if @final_recounts.any? %>
+  <hr>
+  <h3><%= t("officing.final_recounts.new.final_recount_list") %></h3>
+
+  <table>
+    <thead>
+      <th><%= t("officing.final_recounts.new.date")  %></th>
+      <th><%= t("officing.final_recounts.new.booth") %></th>
+      <th><%= t("officing.final_recounts.new.count") %></th>
+      <th><%= t("officing.final_recounts.new.system_count") %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      <% @final_recounts.each do |final_recount| %>
+        <tr id="<%= dom_id(final_recount) %>">
+          <td>
+            <%= l(final_recount.date.to_date, format: :long) %>
+          </td>
+          <td>
+            <%= final_recount.booth_assignment.booth.name %>
+          </td>
+          <td>
+            <strong><%= final_recount.count %></strong>
+          </td>
+          <td>
+            <strong><%= system_recount_to_compare_with_final_recount final_recount %></strong>
+          </td>
+          <td>
+            <%= link_to t("officing.final_recounts.new.add_results"), new_officing_poll_result_path(@poll, oa: final_recount.officer_assignment.id, d: l(final_recount.date.to_date) )%>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
\ No newline at end of file
diff --git a/app/views/officing/polls/final.html.erb b/app/views/officing/polls/final.html.erb
new file mode 100644
index 000000000..b46ab0b13
--- /dev/null
+++ b/app/views/officing/polls/final.html.erb
@@ -0,0 +1,32 @@
+<h2><%= t("officing.polls.final.title") %></h2>
+
+<% if @polls.any? %>
+  <table>
+    <thead>
+      <th colspan="2"><%= t("officing.polls.final.select_poll") %></th>
+    </thead>
+    <tbody>
+      <% @polls.each do |poll| %>
+        <tr id="<%= dom_id(poll) %>" class="poll">
+          <td>
+            <strong>
+              <%= poll.name %>
+            </strong>
+          </td>
+          <td class="text-right">
+            <%= link_to t("officing.polls.final.add_recount"),
+                        new_officing_poll_final_recount_path(poll),
+                        class: "button hollow" %>
+            <%= link_to t("officing.polls.final.add_results"),
+                        new_officing_poll_result_path(poll),
+                        class: "button hollow" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("officing.polls.final.no_polls") %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/officing/polls/index.html.erb b/app/views/officing/polls/index.html.erb
new file mode 100644
index 000000000..8f3e4921e
--- /dev/null
+++ b/app/views/officing/polls/index.html.erb
@@ -0,0 +1,30 @@
+<h2><%= t("officing.polls.index.title") %></h2>
+
+<% if @polls.any? %>
+  <table>
+    <thead>
+      <th><%= t("officing.polls.index.select_poll") %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      <% @polls.each do |poll| %>
+        <tr id="<%= dom_id(poll) %>" class="poll">
+          <td>
+            <strong>
+              <%= link_to poll.name, new_officing_poll_recount_path(poll) %>
+            </strong>
+          </td>
+          <td class="text-right">
+            <%= link_to t("officing.polls.index.add_recount"),
+                        new_officing_poll_recount_path(poll),
+                        class: "button hollow" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("officing.polls.index.no_polls") %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/officing/recounts/new.html.erb b/app/views/officing/recounts/new.html.erb
new file mode 100644
index 000000000..dc78ccf89
--- /dev/null
+++ b/app/views/officing/recounts/new.html.erb
@@ -0,0 +1,63 @@
+<% if @officer_assignments.any? %>
+  <h2><%= t("officing.recounts.new.title", poll: @poll.name) %></h2>
+
+  <%= form_tag(officing_poll_recounts_path(@poll), {id: "officer_assignment_form"}) do %>
+    <!-- Maybe this fields pre filled and disabled? -->
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <label><%= t("officing.recounts.new.booth_date") %></label>
+        <%= select_tag :officer_assignment_id,
+                        officer_assignments_select_options(@officer_assignments),
+                        { prompt: t("officing.recounts.new.select_booth_date"),
+                          label: false } %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-4 column">
+        <label><%= t("officing.recounts.new.count") %></label>
+        <%= text_field_tag :count, nil, placeholder: t("officing.recounts.new.count_placeholder") %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-4 column">
+        <%= submit_tag t("officing.recounts.new.submit"), class: "button expanded" %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <h2><%= @poll.name %></h2>
+  <div class="callout alert">
+    <%= t("officing.recounts.new.not_allowed") %>
+  </div>
+<% end %>
+
+
+<% if @recounted.any? %>
+  <hr>
+  <h3><%= t("officing.recounts.new.recount_list") %></h3>
+
+  <table>
+    <thead>
+      <th><%= t("officing.recounts.new.date")  %></th>
+      <th><%= t("officing.recounts.new.booth") %></th>
+      <th><%= t("officing.recounts.new.count") %></th>
+    </thead>
+    <tbody>
+      <% @recounted.each do |oa| %>
+        <tr id="<%= dom_id(oa.recount) %>">
+          <td>
+            <%= l(oa.date.to_date, format: :long) %>
+          </td>
+          <td>
+            <%= oa.booth_assignment.booth.name %>
+          </td>
+          <td>
+            <strong><%= oa.recount.count %></strong>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
diff --git a/app/views/officing/residence/_errors.html.erb b/app/views/officing/residence/_errors.html.erb
new file mode 100644
index 000000000..4f8895a35
--- /dev/null
+++ b/app/views/officing/residence/_errors.html.erb
@@ -0,0 +1,14 @@
+<% if @residence.errors[:residence_in_madrid].present? %>
+
+  <div id="error_explanation" data-alert class="callout alert" data-closable>
+    <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
+      <span aria-hidden="true">&times;</span>
+    </button>
+    <%= t("officing.residence.new.error_verifying_census") %>
+  </div>
+
+<% else %>
+  <%= render "shared/errors",
+             resource: @residence,
+             message: t("officing.residence.new.form_errors")  %>
+<% end %>
diff --git a/app/views/officing/residence/new.html.erb b/app/views/officing/residence/new.html.erb
new file mode 100644
index 000000000..a508fae52
--- /dev/null
+++ b/app/views/officing/residence/new.html.erb
@@ -0,0 +1,32 @@
+<h2><%= t("officing.residence.new.title") %></h2>
+
+<% if @officer_assignments.present? %>
+  <div class="row verification account">
+    <div class="small-12 medium-8 column">
+      <%= form_for @residence, as: "residence", url: officing_residence_path do |f| %>
+        <%= render "errors" %>
+
+        <div class="small-12 medium-6">
+          <%= f.select :document_type, document_types, prompt: "" %>
+
+
+          <%= f.text_field :document_number,
+                         placeholder: t("officing.residence.new.document_number"),
+                         autocomplete: "off" %>
+        </div>
+
+        <div class="date-of-birth small-12 medium-6">
+          <%= f.text_field :year_of_birth, type: "number", autocomplete: "off" %>
+        </div>
+
+        <div class="small-12 medium-6">
+          <input type="submit" value="<%= t("officing.residence.new.submit") %>" class="button expanded">
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% else %>
+  <div class="callout primary">
+    <%= t("officing.residence.new.no_assignments") %>
+  </div>
+<% end %>
diff --git a/app/views/officing/results/index.html.erb b/app/views/officing/results/index.html.erb
new file mode 100644
index 000000000..70da6d8d3
--- /dev/null
+++ b/app/views/officing/results/index.html.erb
@@ -0,0 +1,57 @@
+<%= back_link_to new_officing_poll_result_path(@poll) %>
+<h2><%= @poll.name %> - <%= t("officing.results.index.results") %></h2>
+
+<% if @partial_results.present? %>
+  <div class="callout primary">
+    <h3>
+      <%= @booth_assignment.booth.name %> - <%= l @partial_results.first.date, format: :long %>
+    </h3>
+  </div>
+
+
+  <div class="row">
+    <div class="small-12 medium-9 column">
+      <table>
+        <thead>
+          <tr>
+            <th><%= t("officing.results.index.table_whites") %></th>
+            <th><%= t("officing.results.index.table_nulls") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td id="white_results"><%= @whites %></td>
+            <td id="null_results"><%= @nulls %></td>
+          </tr>
+        </tbody>
+      </table>
+
+      <% by_question = @partial_results.group_by(&:question_id) %>
+      <% @poll.questions.each do |question| %>
+        <h3><%= question.title %></h3>
+
+        <table>
+          <thead>
+            <tr>
+              <th><%= t("officing.results.index.table_answer") %></th>
+              <th><%= t("officing.results.index.table_votes") %></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% question.valid_answers.each_with_index do |answer, i| %>
+              <% by_answer = by_question[question.id].present? ? by_question[question.id].group_by(&:answer) : {} %>
+              <tr id="question_<%= question.id %>_<%= i %>_result">
+                <td><%= answer %></td>
+                <td><%= by_answer[answer].present? ? by_answer[answer].first.amount : 0 %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      <% end %>
+    </div>
+  </div>
+<% else %>
+  <div class="callout primary">
+    <%= t("officing.results.index.no_results") %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/officing/results/new.html.erb b/app/views/officing/results/new.html.erb
new file mode 100644
index 000000000..74af8af10
--- /dev/null
+++ b/app/views/officing/results/new.html.erb
@@ -0,0 +1,99 @@
+<% if @officer_assignments.any? %>
+  <h2><%= t("officing.results.new.title", poll: @poll.name) %></h2>
+
+  <%= form_tag(officing_poll_results_path(@poll), {id: "officer_assignment_form"}) do %>
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <label><%= t("officing.results.new.booth") %></label>
+        <%= select_tag :officer_assignment_id,
+                        booths_for_officer_select_options(@officer_assignments),
+                        { prompt: t("officing.results.new.select_booth"),
+                          label: false } %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="small-12 medium-6 column">
+        <label><%= t("officing.results.new.date") %></label>
+        <%= select_tag :date,
+                        poll_dates_select_options(@poll),
+                        { prompt: t("officing.results.new.select_date"),
+                          label: false } %>
+      </div>
+    </div>
+
+    <% @poll.questions.each do |question| %>
+      <div class="row">
+        <div class="small-12 column">
+          <h3><%= question.title %></h3>
+        </div>
+        <% question.valid_answers.each_with_index do |answer, i| %>
+          <div class="small-12 medium-6 large-3 column end">
+            <label><%= answer %></label>
+            <%= text_field_tag "questions[#{question.id}][#{i}]", answer_result_value(question.id, i), placeholder: "0" %>
+          </div>
+        <% end %>
+      </div>
+      <hr>
+    <% end %>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-3 column">
+        <h3><%= t("officing.results.new.ballots_white") %></h3>
+        <%= text_field_tag :whites, params[:whites].presence, placeholder: "0" %>
+      </div>
+
+      <div class="small-12 medium-6 large-3 column end">
+        <h3><%= t("officing.results.new.ballots_null") %></h3>
+        <%= text_field_tag :nulls, params[:nulls].presence, placeholder: "0" %>
+      </div>
+    </div>
+    <hr>
+
+    <div class="row">
+      <div class="small-12 medium-6 large-3 column">
+        <%= submit_tag t("officing.results.new.submit"), class: "button expanded" %>
+      </div>
+    </div>
+  <% end %>
+
+<% else %>
+  <h2><%= @poll.name %></h2>
+  <div class="callout alert">
+    <%= t("officing.results.new.not_allowed") %>
+  </div>
+<% end %>
+
+<% if @partial_results.present? %>
+
+  <hr>
+  <h3><%= t("officing.results.new.results_list") %></h3>
+
+  <table>
+    <thead>
+      <th><%= t("officing.results.new.date")  %></th>
+      <th><%= t("officing.results.new.booth") %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <tbody>
+      <% results_by_booth = @partial_results.group_by(&:booth_assignment_id) %>
+      <% results_by_booth.keys.each do |booth_assignment| %>
+        <% results_by_booth[booth_assignment].group_by(&:date).keys.each do |date| %>
+          <tr id="results_<%= booth_assignment %>_<%= date.strftime('%Y%m%d') %>">
+            <td>
+              <%= l(date, format: :long) %>
+            </td>
+            <td>
+              <%= results_by_booth[booth_assignment].first.booth_assignment.booth.name %>
+            </td>
+            <td>
+            <%= link_to t("officing.results.new.see_results"), officing_poll_results_path(@poll, date: l(date), booth_assignment_id: booth_assignment) %>
+            </td>
+          </tr>
+        <% end %>
+      <% end %>
+    </tbody>
+  </table>
+
+<% end %>
+
diff --git a/app/views/officing/voters/_already_voted.html.erb b/app/views/officing/voters/_already_voted.html.erb
new file mode 100644
index 000000000..1476913f9
--- /dev/null
+++ b/app/views/officing/voters/_already_voted.html.erb
@@ -0,0 +1,7 @@
+<div class="row">
+  <div class="small-12 medium-8 column">
+    <div class="callout alert text-center">
+      <strong><%= t("officing.voters.show.error_already_voted") %></strong>
+    </div>
+  </div>
+</div>
diff --git a/app/views/officing/voters/_can_vote.html.erb b/app/views/officing/voters/_can_vote.html.erb
new file mode 100644
index 000000000..27c5e9dbc
--- /dev/null
+++ b/app/views/officing/voters/_can_vote.html.erb
@@ -0,0 +1,14 @@
+<div class="row">
+  <div class="small-12 medium-6 large-4 column">
+    <div class="callout success text-center">
+      <strong><%= t("officing.voters.show.can_vote") %></strong>
+    </div>
+  </div>
+  <div class="small-12 medium-6 large-4 column end">
+    <%= form_for @user, as: :voter, url: officing_voters_path, method: :post, remote: true do |f| %>
+      <%= f.hidden_field :poll_id, value: poll.id %>
+      <%= f.hidden_field :user_id, value: @user.id %>
+      <%= f.submit t("officing.voters.show.submit"), class: "button success expanded" %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/officing/voters/_voted.html.erb b/app/views/officing/voters/_voted.html.erb
new file mode 100644
index 000000000..edd098403
--- /dev/null
+++ b/app/views/officing/voters/_voted.html.erb
@@ -0,0 +1,7 @@
+<div class="row">
+  <div class="small-12 medium-8 column">
+    <div class="callout primary text-center">
+      <strong><%= t("officing.voters.show.success") %></strong>
+    </div>
+  </div>
+</div>
diff --git a/app/views/officing/voters/create.js.erb b/app/views/officing/voters/create.js.erb
new file mode 100644
index 000000000..ee280faa2
--- /dev/null
+++ b/app/views/officing/voters/create.js.erb
@@ -0,0 +1 @@
+$("#<%= dom_id(@poll) %> #actions").html('<%= j render("voted") %>');
\ No newline at end of file
diff --git a/app/views/officing/voters/new.html.erb b/app/views/officing/voters/new.html.erb
new file mode 100644
index 000000000..0f8fa2958
--- /dev/null
+++ b/app/views/officing/voters/new.html.erb
@@ -0,0 +1,30 @@
+<%= back_link_to new_officing_residence_path %>
+
+<h2><%= t("officing.voters.new.title") %></h2>
+
+<% if @polls.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("officing.voters.new.table_poll") %></th>
+        <th><%= t("officing.voters.new.table_actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @polls.each do |poll| %>
+      <tr id="<%= dom_id(poll) %>">
+        <td>
+          <%= poll.name %>
+        </td>
+        <td id="actions">
+          <% if poll.votable_by?(@user) %>
+            <%= render "can_vote", poll: poll %>
+          <% else %>
+            <%= render "already_voted" %>
+          <% end %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
\ No newline at end of file
diff --git a/app/views/polls/_callout.html.erb b/app/views/polls/_callout.html.erb
new file mode 100644
index 000000000..2fad7d07d
--- /dev/null
+++ b/app/views/polls/_callout.html.erb
@@ -0,0 +1,22 @@
+<% unless can?(:answer, @poll) %>
+  <% if current_user.nil? %>
+    <div class="callout primary">
+      <%= t("polls.show.cant_answer_not_logged_in",
+            signin: link_to(t("polls.show.signin"), new_user_session_path, class: "probe-message"),
+            signup: link_to(t("polls.show.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
+    </div>
+  <% elsif current_user.unverified? %>
+    <div class="callout warning">
+      <%= t('polls.show.cant_answer_verify_html',
+            verify_link: link_to(t('polls.show.verify_link'), verification_path)) %>
+    </div>
+  <% elsif @poll.incoming? %>
+    <div class="callout primary">
+      <%= t('polls.show.cant_answer_incoming') %>
+    </div>
+  <% elsif @poll.expired? %>
+    <div class="callout alert">
+      <%= t('polls.show.cant_answer_expired') %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/polls/_poll_group.html.erb b/app/views/polls/_poll_group.html.erb
new file mode 100644
index 000000000..f4dcc5423
--- /dev/null
+++ b/app/views/polls/_poll_group.html.erb
@@ -0,0 +1,75 @@
+<% poll_group.each do |poll| %>
+  <div class="poll">
+    <% if poll.answerable_by?(current_user) && poll.votable_by?(current_user) %>
+      <%= link_to poll,
+              class: "icon-poll-answer can-answer",
+              title: t("polls.index.can_answer") do %>
+          <span class="sr-only">
+            <%= t("polls.index.can_answer") %>
+          </span>
+      <% end %>
+    <% elsif current_user.nil? %>
+      <%= link_to new_user_session_path,
+              class: "icon-poll-answer not-logged-in",
+              title: t("polls.index.cant_answer_not_logged_in") do %>
+          <span class="sr-only">
+            <%= t("polls.index.cant_answer_not_logged_in") %>
+          </span>
+      <% end %>
+    <% elsif current_user.unverified? %>
+      <%= link_to verification_path,
+                  class: "icon-poll-answer unverified",
+                  title: t("polls.index.cant_answer_verify") do %>
+          <span class="sr-only">
+            <%= t("polls.index.cant_answer_verify") %>
+          </span>
+      <% end %>
+    <% elsif !poll.votable_by?(current_user) %>
+      <div class="icon-poll-answer already-answer" title="<%= t("polls.index.already_answer") %>">
+        <span class="sr-only"><%= t("polls.index.already_answer") %></span>
+      </div>
+    <% else %>
+      <div class="icon-poll-answer cant-answer" title="<%= t("polls.index.cant_answer") %>">
+        <span class="sr-only"><%= t("polls.index.cant_answer") %></span>
+      </div>
+    <% end %>
+    <div class="row">
+      <div class="small-12 column">
+        <div class="dates"><%= poll_dates(poll) %></div>
+        <% if poll.questions.count == 1 %>
+          <% poll.questions.each do |question| %>
+            <h4 class="inline-block"><%= link_to question.title, poll %></h4>
+          <% end %>
+        <% else %>
+          <h4 class="inline-block"><%= link_to poll.name, poll %></h4>
+          <ul>
+            <% poll.questions.each do |question| %>
+              <li><%= link_to question.title, question_path(question) %></li>
+            <% end %>
+          </ul>
+        <% end %>
+        <% if poll.geozones.any? %>
+          <p class="inline-block">
+            <small><%= t("polls.index.geozone_info") %></small>
+          </p>
+        <% end %>
+        <ul class="no-bullet inline-block tags">
+          <% poll.geozones.each do |g| %>
+            <li class="inline-block"><span><%= g.name %></span></li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="small-12 medium-6 large-4 column end">
+        <%= link_to poll, class: "button expanded" do %>
+          <% if poll.expired? %>
+            <%= t("polls.index.participate_button_expired") %>
+          <% elsif poll.incoming? %>
+            <%=  t("polls.index.participate_button_incoming") %>
+          <% else %>
+            <%= t("polls.index.participate_button") %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/polls/_reasons_for_not_answering.html.erb b/app/views/polls/_reasons_for_not_answering.html.erb
new file mode 100644
index 000000000..bd0bab3ad
--- /dev/null
+++ b/app/views/polls/_reasons_for_not_answering.html.erb
@@ -0,0 +1,24 @@
+<% if poll.incoming? %>
+  <div class="callout primary">
+    <%= t('poll_questions.show.cant_answer_incoming') %>
+  </div>
+<% elsif poll.expired? %>
+  <div class="callout alert">
+    <%= t('poll_questions.show.cant_answer_expired') %>
+  </div>
+<% elsif current_user.nil? %>
+  <div class="callout primary">
+    <%= t("poll_questions.show.not_logged_in",
+        signin: link_to(t("poll_questions.show.signin"), new_user_session_path, class: "probe-message"),
+        signup: link_to(t("poll_questions.show.signup"), new_user_registration_path, class: "probe-message")).html_safe %>
+  </div>
+<% elsif current_user.unverified? %>
+  <div class="callout warning">
+    <%= t('poll_questions.show.cant_answer_verify_html',
+           verify_link: link_to(t('poll_questions.show.verify_link'), verification_path)) %>
+  </div>
+<% else %>
+  <div class="callout warning">
+    <%= t('poll_questions.show.cant_answer_wrong_geozone') %>
+  </div>
+<% end %>
diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb
new file mode 100644
index 000000000..d8c328267
--- /dev/null
+++ b/app/views/polls/index.html.erb
@@ -0,0 +1,32 @@
+<% provide :title do %><%= t("polls.index.title") %><% end %>
+<% content_for :wrapper_class, "light" %>
+
+<div class="expanded no-margin-top dark-heading">
+  <div class="row">
+    <div class="small-12 medium-6 column padding">
+      <h1><%= t("polls.index.title") %></h1>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="small-12 medium-3 column">
+    <%= render 'shared/filter_subnav_vertical', i18n_namespace: "polls.index" %>
+  </div>
+
+  <div class="small-12 medium-9 column margin-top">
+    <% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
+
+    <% if polls_by_geozone_restriction[false].present? %>
+      <h3 class="section-title-divider"><%= t("polls.index.no_geozone_restricted") %></h3>
+      <%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[false]} %>
+    <% end %>
+
+    <% if polls_by_geozone_restriction[true].present? %>
+      <h3 class="section-title-divider"><%= t("polls.index.geozone_restricted") %></h3>
+      <%= render partial: 'poll_group', locals: {poll_group: polls_by_geozone_restriction[true]} %>
+    <% end %>
+
+    <%= paginate @polls %>
+  </div>
+</div>
diff --git a/app/views/polls/questions/_answers.html.erb b/app/views/polls/questions/_answers.html.erb
new file mode 100644
index 000000000..c88156b68
--- /dev/null
+++ b/app/views/polls/questions/_answers.html.erb
@@ -0,0 +1,22 @@
+<div class="poll-question-answers">
+  <% if can? :answer, question %>
+    <% question.valid_answers.each do |answer| %>
+      <% if @answers_by_question_id[question.id] == answer %>
+        <span class="button answered" title="<%= t("poll_questions.show.voted", answer: answer)%>">
+          <%= answer %>
+        </span>
+      <% else %>
+        <%= link_to answer,
+          answer_question_path(question, answer: answer),
+          method: :post,
+          remote: true,
+          title: t("poll_questions.show.vote_answer", answer: answer),
+          class: "button secondary hollow" %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <% question.valid_answers.each do |answer| %>
+      <span class="button secondary hollow disabled"><%= answer %></span>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/polls/questions/_comments.html.erb b/app/views/polls/questions/_comments.html.erb
new file mode 100644
index 000000000..a967406aa
--- /dev/null
+++ b/app/views/polls/questions/_comments.html.erb
@@ -0,0 +1,31 @@
+<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %>
+  <section class="row-full comments">
+    <div class="row">
+      <div id="comments" class="small-12 column">
+        <h2>
+          <%= t("shared.comments.title") %>
+          <span class="js-comments-count">(<%= @commentable.comments_count %>)</span>
+        </h2>
+
+        <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
+
+        <% if user_signed_in? %>
+          <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %>
+        <% else %>
+        <br>
+
+        <div data-alert class="callout primary">
+          <%= t("shared.comments.login_to_comment",
+              signin: link_to(t("votes.signin"), new_user_session_path),
+              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+          </div>
+        <% end %>
+
+        <% @comment_tree.root_comments.each do |comment| %>
+          <%= render 'comments/comment', comment: comment  %>
+        <% end %>
+        <%= paginate @comment_tree.root_comments %>
+      </div>
+    </div>
+  </section>
+<% end %>
\ No newline at end of file
diff --git a/app/views/polls/questions/_question.html.erb b/app/views/polls/questions/_question.html.erb
new file mode 100644
index 000000000..f0958b6e4
--- /dev/null
+++ b/app/views/polls/questions/_question.html.erb
@@ -0,0 +1,9 @@
+<div id="<%= dom_id(question) %>" class="poll-question">
+  <h3>
+    <%= link_to question.title, question_path(question) %>
+  </h3>
+
+  <div id="<%= dom_id(question) %>_answers" class="padding">
+    <%= render 'polls/questions/answers', question: question %>
+  </div>
+</div>
diff --git a/app/views/polls/questions/answer.js.erb b/app/views/polls/questions/answer.js.erb
new file mode 100644
index 000000000..aabbd8d89
--- /dev/null
+++ b/app/views/polls/questions/answer.js.erb
@@ -0,0 +1 @@
+$("#<%= dom_id(@question) %>_answers").html('<%= j render("polls/questions/answers", question: @question) %>');
diff --git a/app/views/polls/questions/show.html.erb b/app/views/polls/questions/show.html.erb
new file mode 100644
index 000000000..2b7225f9f
--- /dev/null
+++ b/app/views/polls/questions/show.html.erb
@@ -0,0 +1,65 @@
+<% provide :title do %><%= @question.title %><% end %>
+
+<div class="expanded no-margin-top dark-heading">
+  <div class="row">
+    <div class="small-12 medium-9 column padding">
+      <%= render "shared/back_link" %>
+
+      <h1><%= @question.title %></h1>
+
+      <% if @question.proposal.present? %>
+        <div class="margin-bottom">
+          <%= link_to t('poll_questions.show.original_proposal'), @question.proposal %>
+        </div>
+      <% end %>
+
+      <% if can? :answer, @question %>
+        <%= link_to t('poll_questions.show.answer_this_question'),
+              @question.poll,
+              class: 'large button' %>
+      <% else %>
+        <%= render 'polls/reasons_for_not_answering', poll: @question.poll %>
+      <% end %>
+    </div>
+
+    <div class="small-12 medium-3 column info">
+      <p>
+        <span class="title">
+          <strong><%= t('poll_questions.show.author') %></strong>
+        </span>
+        <br>
+        <% if @question.author_visible_name.present? %>
+          <%= @question.author_visible_name %>
+        <% else %>
+          <%= link_to @question.author.name, @question.author %>
+        <% end %>
+
+      </p>
+
+      <p>
+        <span class="title">
+          <strong><%= t('poll_questions.show.poll') %></strong>
+        </span>
+        <br>
+        <%= link_to @question.poll.name, @question.poll %>
+      </p>
+
+      <p>
+        <span class="title">
+          <strong><%= t('poll_questions.show.dates_title') %></strong>
+        </span>
+        <br>
+        <%= poll_dates(@question.poll) %>
+      </p>
+    </div>
+  </div>
+</div>
+
+<div class="row margin-top">
+  <div class="small-12 medium-9 column">
+    <h3><%= t('poll_questions.show.more_info') %></h3>
+    <%= @question.description %>
+  </div>
+</div>
+
+<%= render "comments" %>
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb
new file mode 100644
index 000000000..8178928b6
--- /dev/null
+++ b/app/views/polls/show.html.erb
@@ -0,0 +1,53 @@
+<% provide :title do %><%= @poll.name %><% end %>
+<% content_for :wrapper_class, "light" %>
+
+<div class="polls-show">
+  <div class="expanded no-margin-top dark-heading polls-show-header">
+    <div class="row">
+      <div class="small-12 medium-9 column padding">
+        <%= back_link_to polls_path %>
+
+        <h2><%= @poll.name %></h2>
+        <ul class="no-bullet margin-top tags">
+          <% @poll.geozones.each do |g| %>
+            <li class="inline-block"><span><%= g.name %></span></li>
+          <% end %>
+        </ul>
+
+        <%= render "callout" %>
+      </div>
+      <div class="small-12 medium-3 column">
+        <div class="info">
+          <p>
+            <span class="title">
+              <strong><%= t("polls.show.dates_title") %></strong>
+            </span>
+            <br>
+            <%= poll_dates(@poll) %>
+          </p>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row margin-top">
+    <div class="small-12 medium-9 column">
+      <% @questions.each do |question| %>
+        <%= render 'polls/questions/question', question: question %>
+      <% end %>
+    </div>
+
+    <aside class="small-12 medium-3 column">
+      <div id="social-share" class="sidebar-divider"></div>
+      <h2><%= t("proposals.show.share") %></h2>
+      <div class="social-share-full">
+        <%= social_share_button_tag("#{@poll.name} #{setting['twitter_hashtag']}") %>
+        <% if browser.device.mobile? %>
+          <a href="whatsapp://send?text=<%= @poll.name %> <%= poll_url %>" data-action="share/whatsapp/share">
+            <span class="icon-whatsapp whatsapp"></span>
+          </a>
+        <% end %>
+      </div>
+    </aside>
+  </div>
+</div>
diff --git a/app/views/proposal_ballots/_successfull_proposal.html.erb b/app/views/proposal_ballots/_successfull_proposal.html.erb
deleted file mode 100644
index 870e61605..000000000
--- a/app/views/proposal_ballots/_successfull_proposal.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="<%= dom_id(proposal) %>" class="proposal-sucessfull">
-  <h3><%= link_to proposal.title, proposal %></h3>
-  <div class="info">
-    <% if proposal.author.hidden? || proposal.author.erased? %>
-      <%= t("proposals.show.author_deleted") %>
-    <% else %>
-      <%= proposal.author.name %>
-    <% end %>
-
-    <span class="bullet">&nbsp;&bull;&nbsp;</span>
-    <%= l proposal.created_at.to_date %>
-  </div>
-</div>
diff --git a/app/views/proposal_ballots/index.html.erb b/app/views/proposal_ballots/index.html.erb
deleted file mode 100644
index fe5bdef70..000000000
--- a/app/views/proposal_ballots/index.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<% provide :title do %><%= t("proposal_ballots.title") %><% end %>
-<div class="expanded no-margin-top margin-bottom dark-heading">
-  <div class="row" data-equalizer>
-    <div class="small-12 medium-6 column padding" data-equalizer-watch>
-      <h2>
-        <%= t("proposal_ballots.title") %>
-      </h2>
-      <p>
-        <%= t("proposal_ballots.description_html").html_safe %>
-      </p>
-    </div>
-
-    <div class="small-12 medium-4 column info" data-equalizer-watch>
-      <p class="title"><strong><%= t("proposal_ballots.date_title") %></strong></p>
-      <p class="title-date"><%= t("proposal_ballots.date") %></p>
-    </div>
-  </div>
-</div>
-
-<main>
-  <div class="row">
-    <div class="small-12 column">
-      <% if @proposal_ballots.present? %>
-        <div class="proposals-ballot-list">
-          <% @proposal_ballots.each do |proposal_for_vote| %>
-            <%= render "successfull_proposal", proposal: proposal_for_vote %>
-          <% end %>
-        </div>
-      <% else %>
-        <p>
-          <%= t("proposal_ballots.nothing_to_vote") %>
-        </p>
-      <% end %>
-    </div>
-  </div>
-</main>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
index 69bf8d164..735e8bcec 100644
--- a/app/views/proposals/_proposal.html.erb
+++ b/app/views/proposals/_proposal.html.erb
@@ -1,8 +1,8 @@
 <div id="<%= dom_id(proposal) %>"
-     class="proposal clear <%= ("successfull" if proposal.total_votes > Proposal.votes_needed_for_success) %>"
+     class="proposal clear <%= ("successful" if proposal.total_votes > Proposal.votes_needed_for_success) %>"
      data-type="proposal">
   <div class="panel">
-    <div class="icon-successfull"></div>
+    <div class="icon-successful"></div>
     <div class="row">
 
       <div class="small-12 medium-9 column">
@@ -53,13 +53,21 @@
       </div>
 
       <div id="<%= dom_id(proposal) %>_votes" class="small-12 medium-3 column supports-container">
-        <% if proposal.successfull? %>
+        <% if proposal.successful? %>
           <div class="padding text-center">
+
             <p>
-              <%= t("proposal_ballots.successfull",
-                  voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+              <%= t("proposals.proposal.successful",
+                  voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %>
             </p>
           </div>
+          <% if can? :create, Poll::Question %>
+            <p class="text-center">
+              <%= link_to t('poll_questions.create_question'),
+                          new_admin_question_path(proposal_id: proposal.id),
+                          class: "button hollow" %>
+            </p>
+          <% end %>
         <% elsif proposal.archived? %>
           <div class="padding text-center">
             <strong><%= t("proposals.proposal.supports", count: proposal.total_votes) %></strong>
diff --git a/app/views/proposals/_proposal_ballots_banner.html.erb b/app/views/proposals/_proposal_ballots_banner.html.erb
deleted file mode 100644
index df210a535..000000000
--- a/app/views/proposals/_proposal_ballots_banner.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="next-voting" class="row featured-proposals-ballot-banner">
-  <%= link_to proposal_ballots_path do %>
-    <div class="small-12 column padding">
-      <div class="icon-successfull"></div>
-      <h2><%= t("proposal_ballots.featured_title") %></h2>
-      <p><%= t("proposal_ballots.info") %></p>
-    </div>
-  <% end %>
-</div>
diff --git a/app/views/proposals/_successful_banner.html.erb b/app/views/proposals/_successful_banner.html.erb
new file mode 100644
index 000000000..3bde0e097
--- /dev/null
+++ b/app/views/proposals/_successful_banner.html.erb
@@ -0,0 +1,9 @@
+<div id="next-voting" class="row sucessfull-proposals-banner">
+  <%= link_to polls_path do %>
+    <div class="small-12 column padding">
+      <div class="icon-successful"></div>
+      <h2><%= t("poll_questions.banner.featured_title") %></h2>
+      <p><%= t("poll_questions.banner.info") %></p>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index fd781c04b..e04e563e2 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -33,8 +33,8 @@
         <%= render "shared/banner" %>
       <% end %>
 
-      <% if @proposal_successfull_exists %>
-        <%= render "proposal_ballots_banner" %>
+      <% if @proposal_successful_exists %>
+        <%= render "successful_banner" %>
       <% elsif @featured_proposals.present? %>
         <div id="featured-proposals" class="row featured-proposals">
           <div class="small-12 column">
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index af1173286..80b2d25a9 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -102,13 +102,19 @@
         <div class="sidebar-divider"></div>
         <h2><%= t("votes.supports") %></h2>
         <div id="<%= dom_id(@proposal) %>_votes">
-          <% if @proposal.successfull? %>
-            <div class="padding text-center">
-              <p>
-                <%= t("proposal_ballots.successfull",
-                    voting: link_to(t("proposal_ballots.voting"), proposal_ballots_path)).html_safe %>
+
+          <% if @proposal.successful? %>
+            <p>
+              <%= t("proposals.proposal.successful",
+                  voting: link_to(t("proposals.proposal.voting"), polls_path)).html_safe %>
+            </p>
+            <% if can? :create, Poll::Question %>
+              <p class="text-center">
+                <%= link_to t('poll_questions.create_question'),
+                            new_admin_question_path(proposal_id: @proposal.id),
+                            class: "button hollow expanded" %>
               </p>
-            </div>
+            <% end %>
           <% elsif @proposal.archived? %>
             <div class="padding text-center">
               <p>
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index 1d7c7f188..13bbb9d01 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -23,4 +23,10 @@
       <%= link_to t("layouts.header.management"), management_sign_in_path %>
     </li>
   <% end %>
+
+  <% if current_user.administrator? || current_user.poll_officer? %>
+    <li>
+      <%= link_to t("layouts.header.officing"), officing_root_path %>
+    </li>
+  <% end %>
 <% end %>
diff --git a/app/views/shared/_filter_subnav_vertical.html.erb b/app/views/shared/_filter_subnav_vertical.html.erb
new file mode 100644
index 000000000..b58ecaccc
--- /dev/null
+++ b/app/views/shared/_filter_subnav_vertical.html.erb
@@ -0,0 +1,14 @@
+<ul class="menu vertical clear">
+  <li class="sr-only"><%= t("#{i18n_namespace}.filter") %>: </li>
+
+  <% @valid_filters.each do |filter| %>
+    <% if @current_filter == filter %>
+      <li class="active">
+        <h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2>
+      </li>
+    <% else %>
+      <li><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
+        current_path_with_query_params(filter: filter, page: 1) %></li>
+    <% end %>
+  <% end %>
+</ul>
diff --git a/app/views/shared/_subnavigation.html.erb b/app/views/shared/_subnavigation.html.erb
index 148612773..991d771ce 100644
--- a/app/views/shared/_subnavigation.html.erb
+++ b/app/views/shared/_subnavigation.html.erb
@@ -14,12 +14,14 @@
                                 controller_name == 'proposals',
                                 accesskey: "2" %>
     </li>
-    <li>
-      <%= layout_menu_link_to t("layouts.header.proposal_ballot"),
-                                proposal_ballots_path,
-                                controller_name == 'proposal_ballots',
-                                accesskey: "3" %>
-    </li>
+    <% if feature?(:polls) %>
+      <li>
+        <%= layout_menu_link_to t("layouts.header.poll_questions"),
+                                  polls_path,
+                                  controller_name == "polls",
+                                  accesskey: "3" %>
+      </li>
+    <% end %>
     <% if feature?(:spending_proposals) %>
       <li>
         <%= layout_menu_link_to t("layouts.header.spending_proposals"),
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 85844f948..ca6eae46e 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -34,6 +34,7 @@ data:
     - config/locales/devise_views.%{locale}.yml
     - config/locales/responders.%{locale}.yml
     - config/locales/kaminari.%{locale}.yml
+    - config/locales/officing.%{locale}.yml
     - config/locales/budgets.%{locale}.yml
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
@@ -128,6 +129,8 @@ ignore_unused:
   - 'admin.activity.show.filter*'
   - 'admin.comments.index.hidden_*'
   - 'admin.settings.index.features.*'
+  - 'admin.polls.*.submit_button'
+  - 'admin.booths.*.submit_button'
   - 'moderation.comments.index.filter*'
   - 'moderation.comments.index.order*'
   - 'moderation.debates.index.filter*'
@@ -139,6 +142,7 @@ ignore_unused:
   - 'valuation.budgets.index.filter*'
   - 'valuation.budget_investments.index.filter*'
   - 'users.show.filters.*'
+  - 'polls.index.filters.*'
   - 'debates.index.select_order'
   - 'debates.index.orders.*'
   - 'proposals.index.select_order'
diff --git a/config/initializers/age.rb b/config/initializers/age.rb
new file mode 100644
index 000000000..2e90c0a3b
--- /dev/null
+++ b/config/initializers/age.rb
@@ -0,0 +1 @@
+require 'age'
diff --git a/config/locales/activemodel.en.yml b/config/locales/activemodel.en.yml
index f62fd1ec6..fd378e705 100644
--- a/config/locales/activemodel.en.yml
+++ b/config/locales/activemodel.en.yml
@@ -15,4 +15,8 @@ en:
           phone: "Telephone"
           confirmation_code: "Confirmation code"
         email:
-          recipient: "Email"
\ No newline at end of file
+          recipient: "Email"
+      officing/residence:
+        document_type: "Document type"
+        document_number: "Document number (including letters)"
+        year_of_birth: "Year born"
\ No newline at end of file
diff --git a/config/locales/activemodel.es.yml b/config/locales/activemodel.es.yml
index e45eade16..dafc45a87 100644
--- a/config/locales/activemodel.es.yml
+++ b/config/locales/activemodel.es.yml
@@ -15,4 +15,8 @@ es:
           phone: "Teléfono"
           confirmation_code: "Código de confirmación"
         email:
-          recipient: "Email"
\ No newline at end of file
+          recipient: "Email"
+      officing/residence:
+        document_type: "Tipo documento"
+        document_number: "Numero de documento (incluida letra)"
+        year_of_birth: "Año de nacimiento"
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index 806ddc96f..608803579 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -34,6 +34,12 @@ en:
       organization:
         one: "Organisation"
         other: "Organisations"
+      poll/booth:
+        one: "booth"
+        other: "booths"
+      poll/officer:
+        one: "officer"
+        other: "officers"
       proposal:
         one: "Citizen proposal"
         other: "Citizen proposals"
@@ -108,6 +114,17 @@ en:
         external_url: "Link to additional documentation"
         geozone_id: "Scope of operation"
         title: "Title"
+      poll:
+        name: "Name"
+        starts_at: "Start Date"
+        ends_at: "Closing Date"
+        geozone_restricted: "Restricted by geozone"
+      poll/question:
+        title: "Question"
+        valid_answers: "Posibles answers"
+        summary: "Summary"
+        description: "Description"
+        external_url: "Link to additional documentation"
       signature_sheet:
         signable_type: "Signable type"
         signable_id: "Signable ID"
@@ -143,6 +160,11 @@ en:
           attributes:
             max_per_day:
               invalid: "You have reached the maximum number of private messages per day"
+        poll/voter:
+          attributes:
+            document_number:
+              not_in_census: "Document not in census"
+              has_voted: "User has already voted"
         proposal:
           attributes:
             tag_list:
diff --git a/config/locales/activerecord.es.yml b/config/locales/activerecord.es.yml
index 43c40110e..71e166026 100644
--- a/config/locales/activerecord.es.yml
+++ b/config/locales/activerecord.es.yml
@@ -37,6 +37,12 @@ es:
       proposal:
         one: "Propuesta ciudadana"
         other: "Propuestas ciudadanas"
+      poll/booth:
+        one: "urna"
+        other: "urnas"
+      poll/officer:
+        one: "presidente de mesa"
+        other: "presidentes de mesa"
       spending_proposal:
         one: "Propuesta de inversión"
         other: "Propuestas de inversión"
@@ -103,6 +109,17 @@ es:
         external_url: "Enlace a documentación adicional"
         geozone_id: "Ámbito de actuación"
         title: "Título"
+      poll:
+        name: "Nombre"
+        starts_at: "Fecha de apertura"
+        ends_at: "Fecha de cierre"
+        geozone_restricted: "Restringida por zonas"
+      poll/question:
+        title: "Pregunta"
+        valid_answers: "Posibles respuestas"
+        summary: "Resumen"
+        description: "Descripción"
+        external_url: "Enlace a documentación adicional"
       signature_sheet:
         signable_type: "Tipo de hoja de firmas"
         signable_id: "ID Propuesta ciudadana/Propuesta inversión"
@@ -138,6 +155,11 @@ es:
           attributes:
             max_per_day:
               invalid: "Has llegado al número máximo de mensajes privados por día"
+        poll/voter:
+          attributes:
+            document_number:
+              not_in_census: "Este documento no aparece en el censo"
+              has_voted: "Este usuario ya ha votado"
         proposal:
           attributes:
             tag_list:
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 4ad60f2a4..5ae6d6f49 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -1,7 +1,10 @@
 ---
 en:
   admin:
+    header:
+      title: Administration
     actions:
+      actions: Actions
       confirm: Are you sure?
       confirm_hide: Confirm
       hide: Hide
@@ -9,6 +12,8 @@ en:
       restore: Restore
       mark_featured: Featured
       unmark_featured: Unmark featured
+      edit: Edit
+      configure: Configure
     banners:
       index:
         title: Banners
@@ -190,17 +195,20 @@ en:
       activity: Moderator activity
       admin: Admin menu
       banner: Manage banners
+      poll_questions: Poll questions
+      proposals_topics: Proposals topics
       budgets: Participatory budgets
-      debate_topics: Debate topics
       geozones: Manage geozones
       hidden_comments: Hidden comments
       hidden_debates: Hidden debates
       hidden_proposals: Hidden proposals
       hidden_users: Hidden users
-      incomplete_verifications: Incomplete verifications
       managers: Managers
       moderators: Moderators
       valuators: Valuators
+      poll_officers: Poll officers
+      polls: Polls
+      poll_booths: Booths location
       officials: Officials
       organizations: Organisations
       settings: Configuration settings
@@ -211,6 +219,13 @@ en:
         pages: Custom Pages
         images: Custom Images
         content_blocks: Custom content blocks
+      title_categories: Categories
+      title_moderated_content: Moderated content
+      title_budgets: Budgets
+      title_polls: Polls
+      title_profiles: Profiles
+      title_banners: Banners
+      title_site_customization: Site customization
     moderators:
       index:
         title: Moderators
@@ -241,6 +256,162 @@ en:
         in_evaluation_count: In evaluation
         total_count: Total
         cost: Cost
+    poll_officers:
+      index:
+        title: Poll officers
+      officer:
+        add: Add
+        delete: Delete position
+        name: Name
+        email: Email
+        entry_name: officer
+      search:
+        email_placeholder: Search user by email
+        search: Search
+        user_not_found: User not found
+    poll_officer_assignments:
+      flash:
+        destroy: "Officing shift removed"
+        create: "Officing shift added"
+        error_destroy: "An error ocurred when removing officer assignment"
+        error_create: "An error ocurred when adding officer assignment"
+      index:
+        officers_title: "List of officers"
+        no_officers: "There are no officers assigned to this poll."
+        table_name: "Name"
+        table_email: "Email"
+        add_officer_assignments: "Add shifts as officer"
+        edit_officer_assignments: "Edit officing shifts"
+      by_officer:
+        new_assignment: "New shift"
+        date: "Date"
+        booth: "Booth"
+        assignment: "Assignment"
+        select_date: "Select day"
+        select_booth: "Select booth"
+        add_assignment: "Add shift"
+        remove_assignment: "Remove"
+        assignments: "Officing shifts in this poll"
+        no_assignments: "This user has no officing shifts in this poll."
+        recounts: "Daily recounts"
+        recount: "Daily recount (by officer)"
+        final_recounts: "Final recounts"
+        final_recount: "Final recount (by officer)"
+    poll_booth_assignments:
+      flash:
+        destroy: "Booth not assigned anymore"
+        create: "Booth assigned"
+        error_destroy: "An error ocurred when removing booth assignment"
+        error_create: "An error ocurred when assigning booth to the poll"
+      show:
+        location: "Location"
+        officers: "Officers"
+        officers_list: "Officer list for this booth"
+        no_officers: "There are no officers for this booth"
+        recounts: "Recounts"
+        recounts_list: "Recount list for this booth"
+        no_recounts: "There are not daily recounts of this booth yet"
+        date: "Date"
+        count_by_officer: "Daily recount (by officer)"
+        count_final: "Final recount (by officer)"
+        count_by_system:  "Votes (automatic)"
+      index:
+        booths_title: "List of booths"
+        no_booths: "There are no booths assigned to this poll."
+        table_name: "Name"
+        table_location: "Location"
+        table_assignment: "Assignment"
+        remove_booth: "Remove booth from poll"
+        add_booth: "Assign booth"
+    polls:
+      index:
+        title: "List of polls"
+        no_polls: "There are no polls."
+        create: "Create poll"
+        name: "Name"
+        dates: "Dates"
+      new:
+        title: "New poll"
+        submit_button: "Create poll"
+      edit:
+        title: "Edit poll"
+        submit_button: "Update poll"
+      show:
+        questions_tab: Questions
+        booths_tab: Booths
+        officers_tab: Officers
+        recounts_tab: Recounting
+        results_tab: Results
+        no_questions: "There are no questions assigned to this poll."
+        questions_title: "List of questions"
+        remove_question: "Remove question from poll"
+        add_question: "Include question"
+        table_title: "Title"
+        table_assignment: "Assignment"
+        table_name: "Name"
+      flash:
+        question_added: "Question added to this poll"
+        error_on_question_added: "Question could not be assigned to this poll"
+        question_removed: "Question removed from this poll"
+        error_on_question_removed: "Question could not be removed from this poll"
+    questions:
+      index:
+        title: "Questions"
+        create: "Create question"
+        no_questions: "There are no questions."
+        filter_poll: Filter by Poll
+        select_poll: Select Poll
+        questions_tab: "Questions"
+        successful_proposals_tab: "Successful proposals"
+        create_question: "Create question"
+        table_proposal: "Proposal"
+        table_question: "Question"
+      edit:
+        title: "Edit Question"
+      new:
+        title: "Create Question"
+        poll_label: "Poll"
+        valid_answers_note: "Enter the answers separated by commas (,)"
+      show:
+        proposal: Original proposal
+        author: Author
+        title: Title
+        valid_answers: Valid answers
+        description: Description
+        preview: View on website
+    recounts:
+      index:
+        title: "Recounts"
+        no_recounts: "There is nothing to be recounted"
+        table_booth_name: "Booth"
+        table_recounts: "Accumulated daily recounts (by officer)"
+        table_final_recount: "Final recount (by officer)"
+        table_system_count: "Votes (automatic)"
+    results:
+      index:
+        title: "Results"
+        no_results: "There are no results"
+        table_whites: "Blank ballots"
+        table_nulls: "Invalid ballots"
+        table_answer: Answer
+        table_votes: Votes
+    booths:
+      index:
+        title: "List of booths"
+        no_booths: "There are no booths."
+        add_booth: "Add booth"
+        name: "Name"
+        location: "Location"
+      new:
+        title: "New booth"
+        name: "Name"
+        location: "Location"
+        submit_button: "Create booth"
+      edit:
+        title: "Edit booth"
+        submit_button: "Update booth"
+      show:
+        location: "Location"
     officials:
       edit:
         destroy: Remove 'Official' status
@@ -303,6 +474,15 @@ en:
           enable: "Enable"
           disable: "Disable"
     shared:
+      booths_search:
+        button: Search
+        placeholder: Search booth by name
+      poll_officers_search:
+        button: Search
+        placeholder: Search poll officers
+      poll_questions_search:
+        button: Search
+        placeholder: Search poll questions
       proposal_search:
         button: Search
         placeholder: Search proposals by title, code, description or question
@@ -312,6 +492,8 @@ en:
       user_search:
         button: Search
         placeholder: Search user by name or email'
+      search_results: "Search results"
+      no_search_results: "No results found."
     spending_proposals:
       index:
         geozone_filter_all: All zones
@@ -443,6 +625,7 @@ en:
         visits_title: Visits
         direct_messages: Direct messages
         proposal_notifications: Proposal notifications
+        incomplete_verifications: Incomplete verifications
       direct_messages:
         title: Direct messages
         total: Total
@@ -455,9 +638,9 @@ en:
       create: Create Topic
       destroy: Destroy Topic
       index:
-        add_tag: Add a new debate topic
-        title: Debate topics
-      mark_as_featured: Propose topic upon creating debate
+        add_tag: Add a new proposal topic
+        title: Proposal topics
+      mark_as_featured: Propose topic upon creating proposal
       name:
         placeholder: Type the name of the topic
       update: Update Topic
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 96ff667df..f5db64135 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -1,7 +1,10 @@
 ---
 es:
   admin:
+    header:
+      title: Administración
     actions:
+      actions: Acciones
       confirm: "¿Estás seguro?"
       confirm_hide: Confirmar
       hide: Ocultar
@@ -9,6 +12,8 @@ es:
       restore: Volver a mostrar
       mark_featured: Destacar
       unmark_featured: Quitar destacado
+      edit: Editar
+      configure: Configurar
     banners:
       index:
         title: Banners
@@ -190,17 +195,20 @@ es:
       activity: Actividad de moderadores
       admin: Menú de administración
       banner: Gestionar banners
+      proposals_topics: Temas de propuestas
+      poll_questions: Preguntas ciudadanas
       budgets: Presupuestos participativos
-      debate_topics: Temas de debate
       geozones: Gestionar distritos
       hidden_comments: Comentarios ocultos
       hidden_debates: Debates ocultos
       hidden_proposals: Propuestas ocultas
       hidden_users: Usuarios bloqueados
-      incomplete_verifications: Verificaciones incompletas
       managers: Gestores
       moderators: Moderadores
       valuators: Evaluadores
+      poll_officers: Presidentes de mesa
+      polls: Votaciones
+      poll_booths: Ubicación de urnas
       officials: Cargos públicos
       organizations: Organizaciones
       settings: Configuración global
@@ -211,6 +219,13 @@ es:
         pages: Personalizar páginas
         images: Personalizar imágenes
         content_blocks: Personalizar bloques
+      title_categories: Categorías
+      title_moderated_content: Contenido moderado
+      title_budgets: Presupuestos
+      title_polls: Votaciones
+      title_profiles: Perfiles
+      title_banners: Banners
+      title_site_customization: Personalizar sitio
     moderators:
       index:
         title: Moderadores
@@ -241,6 +256,162 @@ es:
         in_evaluation_count: En evaluación
         total_count: Total
         cost: Coste total
+    poll_officers:
+      index:
+        title: Presidentes de mesa
+      officer:
+        add: Añadir como Presidente de mesa
+        delete: Eliminar cargo
+        name: Nombre
+        email: Email
+        entry_name: presidente de mesa
+      search:
+        email_placeholder: Buscar usuario por email
+        search: Buscar
+        user_not_found: Usuario no encontrado
+    poll_officer_assignments:
+      flash:
+        destroy: "Eliminado turno de presidente de mesa"
+        create: "Añadido turno de presidente de mesa"
+        error_destroy: "Se ha producido un error al eliminar el turno"
+        error_create: "Se ha producido un error al intentar crear el turno"
+      index:
+        officers_title: "Listado de presidentes de mesa asignados"
+        no_officers: "No hay presidentes de mesa asignados a esta votación."
+        table_name: "Nombre"
+        table_email: "Email"
+        add_officer_assignments: "Añadir turnos como presidente de mesa"
+        edit_officer_assignments: "Editar turnos"
+      by_officer:
+        new_assignment: "Nuevo turno"
+        date: "Fecha"
+        booth: "Urna"
+        assignment: "Asignación"
+        select_date: "Seleccionar día"
+        select_booth: "Seleccionar urna"
+        add_assignment: "Añadir turno"
+        remove_assignment: "Eliminar turno"
+        assignments: "Turnos como presidente de mesa en esta votación"
+        no_assignments: "No tiene turnos como presidente de mesa en esta votación."
+        recounts: "Recuentos diarios"
+        recount: "Recuento diario (presidente de mesa)"
+        final_recounts: "Recuentos finales"
+        final_recount: "Recuento final (presidente de mesa)"
+    poll_booth_assignments:
+      flash:
+        destroy: "Urna desasignada"
+        create: "Urna asignada"
+        error_destroy: "Se ha producido un error al desasignar la urna"
+        error_create: "Se ha producido un error al intentar asignar la urna"
+      show:
+        location: "Ubicación"
+        officers: "Presidentes de mesa"
+        officers_list: "Lista de presidentes de mesa asignados a esta urna"
+        no_officers: "No hay presidentes de mesa para esta urna"
+        recounts: "Recuentos"
+        recounts_list: "Lista de recuentos de esta urna"
+        no_recounts: "No hay recuentos diarios de esta urna"
+        date: "Fecha"
+        count_by_officer: "Recuento diario (presidente de mesa)"
+        count_final: "Recuento final (presidente de mesa)"
+        count_by_system:  "Votos (automático)"
+      index:
+        booths_title: "Listado de urnas asignadas"
+        no_booths: "No hay urnas asignadas a esta votación."
+        table_name: "Nombre"
+        table_location: "Ubicación"
+        table_assignment: "Asignación"
+        remove_booth: "Desasignar urna"
+        add_booth: "Asignar urna"
+    polls:
+      index:
+        title: "Listado de votaciones"
+        no_polls: "No hay ninguna votación."
+        create: "Crear votación"
+        name: "Nombre"
+        dates: "Fechas"
+      new:
+        title: "Nueva votación"
+        submit_button: "Crear votación"
+      edit:
+        title: "Editar votación"
+        submit_button: "Actualizar votación"
+      show:
+        questions_tab: Preguntas
+        booths_tab: Urnas
+        officers_tab: Presidentes de mesa
+        recounts_tab: Recuentos
+        results_tab: Resultados
+        no_questions: "No hay preguntas asignadas a esta votación."
+        questions_title: "Listado de preguntas asignadas"
+        remove_question: "Desasignar pregunta"
+        add_question: "Incluir pregunta"
+        table_title: "Título"
+        table_assignment: "Asignación"
+        table_name: "Nombre"
+      flash:
+        question_added: "Pregunta añadida a esta votación"
+        error_on_question_added: "No se pudo asignar la pregunta"
+        question_removed: "Pregunta eliminada de esta votación"
+        error_on_question_removed: "No se pudo quitar la pregunta"
+    questions:
+      index:
+        title: "Preguntas ciudadanas"
+        create: "Crear pregunta ciudadana"
+        no_questions: "No hay ninguna pregunta ciudadana."
+        filter_poll: "Filtrar por votación"
+        select_poll: "Seleccionar votación"
+        questions_tab: "Preguntas ciudadanas"
+        successful_proposals_tab: "Propuestas que han superado el umbral"
+        create_question: "Crear pregunta para votación"
+        table_proposal: "Propuesta"
+        table_question: "Pregunta"
+      edit:
+        title: "Editar pregunta ciudadana"
+      new:
+        title: "Crear pregunta ciudadana"
+        poll_label: "Votación"
+        valid_answers_note: "Escribe las respuestas separadas por comas (,)"
+      show:
+        proposal: Propuesta ciudadana original
+        author: Autor
+        title: Título
+        valid_answers: Respuestas válidas
+        description: Descripción
+        preview: Ver en la web
+    recounts:
+      index:
+        title: "Recuentos"
+        no_recounts: "No hay nada de lo que hacer recuento"
+        table_booth_name: "Urna"
+        table_recounts: "Recuentos diarios acumulados (presidente de mesa)"
+        table_final_recount: "Recuento final (presidente de mesa)"
+        table_system_count: "Votos (automático)"
+    results:
+      index:
+        title: "Resultados"
+        no_results: "No hay resultados"
+        table_whites: Papeletas en blanco
+        table_nulls: Papeletas nulas
+        table_answer: Respuesta
+        table_votes: Votos
+    booths:
+      index:
+        title: "Lista de urnas"
+        no_booths: "No hay urnas."
+        add_booth: "Añadir urna"
+        name: "Nombre"
+        location: "Ubicación"
+      new:
+        title: "Nueva urna"
+        name: "Nombre"
+        location: "Ubicación"
+        submit_button: "Crear urna"
+      edit:
+        title: "Editar urna"
+        submit_button: "Actualizar urna"
+      show:
+        location: "Ubicación"
     officials:
       edit:
         destroy: Eliminar condición de 'Cargo Público'
@@ -303,6 +474,15 @@ es:
           enable: "Activar"
           disable: "Desactivar"
     shared:
+      booths_search:
+        button: Buscar
+        placeholder: Buscar urna por nombre
+      poll_officers_search:
+        button: Buscar
+        placeholder: Buscar presidentes de mesa
+      poll_questions_search:
+        button: Buscar
+        placeholder: Buscar preguntas
       proposal_search:
         button: Buscar
         placeholder: Buscar propuestas por título, código, descripción o pregunta
@@ -312,6 +492,8 @@ es:
       user_search:
         button: Buscar
         placeholder: Buscar usuario por nombre o email
+      search_results: "Resultados de la búsqueda"
+      no_search_results: "No se han encontrado resultados."
     spending_proposals:
       index:
         geozone_filter_all: Todos los ámbitos de actuación
@@ -443,6 +625,7 @@ es:
         visits_title: Visitas
         direct_messages: Mensajes directos
         proposal_notifications: Notificaciones de propuestas
+        incomplete_verifications: Verificaciones incompletas
       direct_messages:
         title: Mensajes directos
         total: Total
@@ -455,9 +638,9 @@ es:
       create: Crear Tema
       destroy: Eliminar Tema
       index:
-        add_tag: Añade un nuevo tema de debate
-        title: Temas de debate
-      mark_as_featured: Proponer tema al crear debate
+        add_tag: Añade un nuevo tema de propuesta
+        title: Temas de propuesta
+      mark_as_featured: Proponer tema al crear propuesta
       name:
         placeholder: Escribe el nombre del tema
       update: Actualizar Tema
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7c0948ac7..b6001a744 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -139,6 +139,7 @@ en:
   errors:
     messages:
       user_not_found: User not found
+      invalid_date_range: "Invalid date range"
   form:
     accept_terms: I agree to the %{policy} and the %{conditions}
     accept_terms_title: I agree to the Privacy Policy and the Terms and conditions of use
@@ -198,6 +199,7 @@ en:
       management: Management
       moderation: Moderation
       valuation: Valuation
+      officing: Polling officers
       more_info: More information
       my_account_link: My account
       my_activity_link: My activity
@@ -211,7 +213,7 @@ en:
       open_city_title: Love the city, and it will become a city you love.
       open_gov: Open government
       proposals: Proposals
-      proposal_ballot: Voting
+      poll_questions: Voting
       see_all: See proposals
       budgets: Participatory budgeting
       spending_proposals: Spending Proposals
@@ -365,6 +367,8 @@ en:
       supports_necessary: "%{number} supports needed"
       total_percent: 100%
       archived: "This proposal has been archived and can't collect supports."
+      successful: "This proposal has reached the required supports and will be voted in the %{voting}."
+      voting: "next voting"
     show:
       author_deleted: User deleted
       code: 'Proposal code:'
@@ -387,17 +391,60 @@ en:
     update:
       form:
         submit_button: Save changes
-  proposal_ballots:
-    title: "Votings"
-    description_html: "The following citizen proposals that have reached the <strong>required supports</strong> and will be voted."
-    date_title: "Dates of participation"
-    date: "Soon we'll announce the date of vote these proposals."
-    successfull: "This proposal has reached the required supports and will be voted in the %{voting}."
-    voting: "next voting"
-    featured_title: "#NextVoting"
-    nothing_to_vote: "There is nothing to vote at the moment."
-    info: "New proposals that have reached the voting phase."
-    button: "I want to decide"
+  polls:
+    all: "All"
+    no_dates: "no date assigned"
+    dates: "From %{open_at} to %{closed_at}"
+    final_date: "Final recounts/Results"
+    index:
+      filters:
+        current: "Open"
+        incoming: "Incoming"
+        expired: "Expired"
+      title: "Polls"
+      participate_button: "Participate in this poll"
+      participate_button_incoming: "More information"
+      participate_button_expired: "Poll ended"
+      no_geozone_restricted: "All city"
+      geozone_restricted: "Districts"
+      geozone_info: "Can participate people in the Census of: "
+      can_answer: "You can participate in this poll!"
+      cant_answer: "This poll is not available on your geozone"
+      cant_answer_not_logged_in: "You must sign in or sign up to participate"
+      cant_answer_verify: "You must verify your account in order to answer"
+      already_answer: "You already have participated in this poll"
+    show:
+      dates_title: "Participation dates"
+      cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
+      signin: Sign in
+      signup: Sign up
+      cant_answer_verify_html: "You must %{verify_link} in order to answer."
+      verify_link: "verify your account"
+      cant_answer_incoming: "This poll has not yet started."
+      cant_answer_expired: "This poll has finished."
+  poll_questions:
+    create_question: "Create question"
+    default_valid_answers: "Yes, No"
+    show:
+      answer_this_question: "Answer this question"
+      original_proposal: "Original proposal"
+      author: "Created by"
+      dates_title: "Participation dates"
+      more_info: "More information"
+      not_logged_in: "You must %{signin} or %{signup} to participate."
+      signin: Sign in
+      signup: Sign up
+      cant_answer_verify_html: "You must %{verify_link} in order to answer."
+      verify_link: "verify your account"
+      cant_answer_incoming: "This poll has not yet started."
+      cant_answer_expired: "This poll has finished."
+      cant_answer_wrong_geozone: "This question is not available on your geozone."
+      vote_answer: "Vote %{answer}"
+      voted: "You have voted %{answer}"
+      poll: "Poll"
+    banner:
+      featured_title: "#NextVoting"
+      info: "New proposals that have reached the voting phase."
   proposal_notifications:
     new:
       title: "Send message"
@@ -409,6 +456,12 @@ en:
     show:
       back: "Go back to my activity"
   shared:
+    edit: 'Edit'
+    save: 'Save'
+    delete: 'Delete'
+    comments:
+      title: 'Comments'
+      login_to_comment: 'You must %{signin} or %{signup} to leave a comment.'
     "yes": "Yes"
     "no": "No"
     advanced_search:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 1c751b518..7d942a1e6 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -139,6 +139,7 @@ es:
   errors:
     messages:
       user_not_found: No se encontró el usuario
+      invalid_date_range: "El rango de fechas no es válido"
   form:
     accept_terms: Acepto la %{policy} y las %{conditions}
     accept_terms_title: Acepto la Política de privacidad y las Condiciones de uso
@@ -198,6 +199,7 @@ es:
       management: Gestión
       moderation: Moderar
       valuation: Evaluación
+      officing: Presidentes de mesa
       more_info: Más información
       my_account_link: Mi cuenta
       my_activity_link: Mi actividad
@@ -211,7 +213,7 @@ es:
       open_city_title: La ciudad que quieres será la ciudad que quieras.
       open_gov: Gobierno %{open}
       proposals: Propuestas
-      proposal_ballot: Votaciones
+      poll_questions: Votaciones
       see_all: Ver propuestas
       budgets: Presupuestos ciudadanos
       spending_proposals: "Propuestas de inversión"
@@ -365,6 +367,8 @@ es:
       supports_necessary: "%{number} apoyos necesarios"
       total_percent: 100%
       archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos."
+      successful: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
+      voting: "próxima votación"
     show:
       author_deleted: Usuario eliminado
       code: 'Código de la propuesta:'
@@ -387,17 +391,60 @@ es:
     update:
       form:
         submit_button: Guardar cambios
-  proposal_ballots:
-    title: "Votaciones"
-    description_html: "Las siguientes propuestas ciudadanas han alcanzado el <strong>número de apoyos necesarios</strong> y pasarán a votación."
-    date_title: "Fechas de participación"
-    date: "En breve anunciaremos la fecha de votación de estas propuestas."
-    successfull: "Esta propuesta ha alcanzado los apoyos necesarios y pasará a la %{voting}."
-    voting: "próxima votación"
-    featured_title: "#PróximaVotación"
-    nothing_to_vote: "No hay nada que votar en este momento."
-    info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
-    button: "Quiero decidir"
+  polls:
+    all: "Todas"
+    no_dates: "sin fecha asignada"
+    dates: "Desde el %{open_at} hasta el %{closed_at}"
+    final_date: "Recuento final/Resultados"
+    index:
+      filters:
+        current: "Abiertas"
+        incoming: "Próximamente"
+        expired: "Terminadas"
+      title: "Votaciones"
+      participate_button: "Participar en esta votación"
+      participate_button_incoming: "Más información"
+      participate_button_expired: "Votación terminada"
+      no_geozone_restricted: "Toda la ciudad"
+      geozone_restricted: "Distritos"
+      geozone_info: "Pueden participar las personas empadronadas en: "
+      can_answer: "¡Puedes participar en esta votación!"
+      cant_answer: "Esta votación no está disponible en tu zona"
+      cant_answer_not_logged_in: "Necesitas iniciar sesión o registrarte para participar"
+      cant_answer_verify: "Por favor verifica tu cuenta para poder responder"
+      already_answer: "Ya has participado en esta votación"
+    show:
+      dates_title: "Fechas de participación"
+      cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
+      signin: iniciar sesión
+      signup: registrarte
+      cant_answer_verify_html: "Por favor %{verify_link} para poder responder."
+      verify_link: "verifica tu cuenta"
+      cant_answer_incoming: "Esta votación todavía no ha comenzado."
+      cant_answer_expired: "Esta votación ha terminado."
+  poll_questions:
+    create_question: "Crear pregunta para votación"
+    default_valid_answers: "Sí, No"
+    show:
+      answer_this_question: "Responder a esta pregunta"
+      original_proposal: "Propuesta original"
+      author: "Creado por"
+      dates_title: "Fechas de participación"
+      more_info: "Más información"
+      not_logged_in: "Necesitas %{signin} o %{signup} para participar."
+      signin: iniciar sesión
+      signup: registrarte
+      cant_answer_verify_html: "Por favor %{verify_link} para poder responder."
+      verify_link: "verifica tu cuenta"
+      cant_answer_incoming: "Esta votación todavía no ha comenzado."
+      cant_answer_expired: "Esta votación ha terminado."
+      cant_answer_wrong_geozone: "Esta votación no está disponible en tu zona."
+      vote_answer: "Votar %{answer}"
+      voted: "Has votado %{answer}"
+      poll: "Votación"
+    banner:
+      featured_title: "#PróximaVotación"
+      info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
   proposal_notifications:
     new:
       title: "Enviar mensaje"
@@ -409,6 +456,12 @@ es:
     show:
       back: "Volver a mi actividad"
   shared:
+    edit: 'Editar'
+    save: 'Guardar'
+    delete: 'Borrar'
+    comments:
+      title: 'Comentarios'
+      login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.'
     "yes": "Sí"
     "no": "No"
     advanced_search:
diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml
index 6304e8d62..66697f5e4 100755
--- a/config/locales/moderation.en.yml
+++ b/config/locales/moderation.en.yml
@@ -1,6 +1,8 @@
 ---
 en:
   moderation:
+    header:
+      title: Moderation
     comments:
       index:
         block_authors: Block authors
diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml
index 2d7c3aea5..b41ba0fbf 100644
--- a/config/locales/moderation.es.yml
+++ b/config/locales/moderation.es.yml
@@ -1,6 +1,8 @@
 ---
 es:
   moderation:
+    header:
+      title: Moderación
     comments:
       index:
         block_authors: Bloquear autores
diff --git a/config/locales/officing.en.yml b/config/locales/officing.en.yml
new file mode 100644
index 000000000..ffda9d326
--- /dev/null
+++ b/config/locales/officing.en.yml
@@ -0,0 +1,103 @@
+---
+en:
+  officing:
+    header:
+      title: Polling
+    dashboard:
+      index:
+        title: Poll officing
+        info: Here you can validate user documents and store voting results
+    menu:
+      voters: Validate document
+      recounts: Store recount
+      final_recounts: Final recounts and results
+    polls:
+      index:
+        title: Poll list
+        no_polls: You are not officing in any active poll
+        select_poll: Select poll
+        add_recount: Add recount
+      final:
+        title: Polls ready for final recounting
+        no_polls: You are not officing final recounts in any active poll
+        select_poll: Select poll
+        add_recount: Add final recount
+        add_results: Add results
+    recounts:
+      flash:
+        create: "Data added"
+        error_create: "Count NOT added. Error in data."
+      new:
+        title: "%{poll} - Add daily recount"
+        not_allowed: "You are not a poll officer for this poll"
+        booth_date: "Booth and date"
+        select_booth_date: "Select booth and date"
+        count: "Vote count"
+        count_placeholder: "Vote count"
+        submit: Save
+        recount_list: "Your recounts"
+        booth: "Booth"
+        date: "Date"
+    final_recounts:
+      flash:
+        create: "Data added"
+        error_create: "Final counts NOT added. Error in data."
+      new:
+        title: "%{poll} - Add final recount"
+        not_allowed: "You are allowed to add final recounts for this poll"
+        booth: "Booth"
+        date: "Date"
+        select_booth: "Select booth"
+        select_date: "Select date"
+        count: "Final vote count"
+        count_placeholder: "Final vote count"
+        submit: Save
+        final_recount_list: "Your final recounts"
+        system_count: "System recount"
+        add_results: "Add results"
+    results:
+      flash:
+        create: "Results saved"
+        error_create: "Results NOT saved. Error in data."
+        error_wrong_booth: "Wrong booth. Results NOT saved."
+        error_wrong_date: "Wrong date. Results NOT saved."
+      new:
+        title: "%{poll} - Add results"
+        not_allowed: "You are allowed to add results for this poll"
+        booth: "Booth"
+        date: "Date"
+        select_booth: "Select booth"
+        select_date: "Select date"
+        ballots_white: "Blank ballots"
+        ballots_null: "Invalid ballots"
+        submit: "Save"
+        results_list: "Your results"
+        see_results: "See results"
+      index:
+        no_results: "No results"
+        results: Results
+        table_answer: Answer
+        table_votes: Votes
+        table_whites: "Blank ballots"
+        table_nulls: "Invalid ballots"
+    residence:
+      flash:
+        create: "Document verified with Census"
+        not_allowed: "You don't have officing shifts today"
+      new:
+        title: Validate document
+        document_number: "Document number (including letters)"
+        submit: Validate document
+        error_verifying_census: "The Census was unable to verify this document."
+        form_errors: prevented the verification of this document
+        no_assignments: "You don't have officing shifts today"
+    voters:
+      new:
+        title: Polls
+        table_poll: Poll
+        table_actions: Polls status
+      show:
+        can_vote: Can vote
+        error_already_voted: Has already participated in this poll
+        submit: Confirm vote
+        success: "Vote introduced!"
diff --git a/config/locales/officing.es.yml b/config/locales/officing.es.yml
new file mode 100644
index 000000000..7958b64b0
--- /dev/null
+++ b/config/locales/officing.es.yml
@@ -0,0 +1,103 @@
+---
+es:
+  officing:
+    header:
+      title: Votaciones
+    dashboard:
+      index:
+        title: Presidir mesa de votaciones
+        info: Aquí puedes validar documentos de ciudadanos y guardar los resultados de las urnas
+    menu:
+      voters: "Validar documento y votar"
+      recounts: "Recuento diario"
+      final_recounts: "Recuento final y escrutinio"
+    polls:
+      index:
+        title: "Listado de votaciones"
+        no_polls: "No eres presidente de mesa en ninguna votación activa"
+        select_poll: "Selecciona votación"
+        add_recount: "Añadir recuento"
+      final:
+        title: "Listado de votaciones finalizadas"
+        no_polls: "No tienes permiso para recuento final en ninguna votación reciente"
+        select_poll: "Selecciona votación"
+        add_recount: "Añadir recuentos finales"
+        add_results: "Añadir resultados"
+    recounts:
+      flash:
+        create: "Datos añadidos"
+        error_create: "Recuento NO añadido. Error en los datos"
+      new:
+        title: "%{poll} - Añadir recuento diario"
+        not_allowed: "No eres presidente de mesa en esta votación"
+        booth_date: "Fecha y urna"
+        select_booth_date: "Elige fecha y urna"
+        count: "Número de votos"
+        count_placeholder: "Número de votos"
+        submit: "Guardar"
+        recount_list: "Tus recuentos"
+        booth: "Urna"
+        date: "Fecha"
+    final_recounts:
+      flash:
+        create: "Datos añadidos"
+        error_create: "Recuento final NO añadido. Error en los datos"
+      new:
+        title: "%{poll} - Añadir recuento final"
+        not_allowed: "No tienes permiso para introducir recountos finales"
+        booth: "Urna"
+        date: "Día"
+        select_booth: "Elige urna"
+        select_date: "Elige día"
+        count: "Recuento final"
+        count_placeholder: "Número final de votos"
+        submit: "Guardar"
+        final_recount_list: "Tus recuentos finales"
+        system_count: "Recuento del sistema"
+        add_results: "Añadir resultados"
+    results:
+      flash:
+        create: "Datos guardados"
+        error_create: "Resultados NO añadidos. Error en los datos"
+        error_wrong_booth: "Urna incorrecta. Resultados NO guardados."
+        error_wrong_date: "Fecha incorrecta. Resultados NO guardados."
+      new:
+        title: "%{poll} - Añadir resultados"
+        not_allowed: "No tienes permiso para introducir resultados"
+        booth: "Urna"
+        date: "Día"
+        select_booth: "Elige urna"
+        select_date: "Elige día"
+        ballots_white: "Papeletas en blanco"
+        ballots_null: "Papeletas nulas"
+        submit: "Guardar"
+        results_list: "Tus resultados"
+        see_results: "Ver resultados"
+      index:
+        no_results: "No hay resultados"
+        results: "Resultados"
+        table_answer: Respuesta
+        table_votes: Votos
+        table_whites: Papeletas en blanco
+        table_nulls: Papeletas nulas
+    residence:
+      flash:
+        create: "Documento verificado con el Padrón"
+        not_allowed: "Hoy no tienes turno de presidente de mesa"
+      new:
+        title: Validar documento
+        document_number: "Número de documento (incluida letra)"
+        submit: Validar documento
+        error_verifying_census: El Padrón no pudo verificar este documento.
+        form_errors: evitaron verificar este documento
+        no_assignments: "Hoy no tienes turno de presidente de mesa"
+    voters:
+      new:
+        title: Votaciones
+        table_poll: Votación
+        table_actions: Estado de las votaciones
+      show:
+        can_vote: Puede votar
+        error_already_voted: "Ya ha participado en esta votación."
+        submit: Confirmar voto
+        success: "¡Voto introducido!"
diff --git a/config/locales/responders.en.yml b/config/locales/responders.en.yml
index 100ae5f41..099751345 100755
--- a/config/locales/responders.en.yml
+++ b/config/locales/responders.en.yml
@@ -6,6 +6,8 @@ en:
         notice: "%{resource_name} created successfully."
         debate: "Debate created successfully."
         direct_message: "You message has been sent successfully."
+        poll: "Poll created successfully."
+        poll_booth: "Booth created successfully."
         proposal: "Proposal created successfully."
         proposal_notification: "Your message has been sent correctly."
         spending_proposal: "Spending proposal created successfully. You can access it from %{activity}"
@@ -16,9 +18,12 @@ en:
       update:
         notice: "%{resource_name} updated successfully."
         debate: "Debate updated successfully."
+        poll: "Poll updated successfully."
+        poll_booth: "Booth updated successfully."
         proposal: "Proposal updated successfully."
         spending_proposal: "Investment project updated succesfully."
         budget_investment: "Investment project updated succesfully."
       destroy:
         spending_proposal: "Spending proposal deleted succesfully."
         budget_investment: "Investment project deleted succesfully."
+        error: "Could not delete"
diff --git a/config/locales/responders.es.yml b/config/locales/responders.es.yml
index 43eb00669..166809af9 100644
--- a/config/locales/responders.es.yml
+++ b/config/locales/responders.es.yml
@@ -6,6 +6,8 @@ es:
         notice: "%{resource_name} creado correctamente."
         debate: "Debate creado correctamente."
         direct_message: "Tu mensaje ha sido enviado correctamente."
+        poll: "Votación creada correctamente."
+        poll_booth: "Urna creada correctamente."
         proposal: "Propuesta creada correctamente."
         proposal_notification: "Tu message ha sido enviado correctamente."
         spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}"
@@ -17,8 +19,11 @@ es:
         notice: "%{resource_name} actualizado correctamente."
         debate: "Debate actualizado correctamente."
         proposal: "Propuesta actualizada correctamente."
+        poll: "Votación actualizada correctamente."
+        poll_booth: "Urna actualizada correctamente."
         spending_proposal: "Propuesta de inversión actualizada correctamente."
         budget_investment: "Propuesta de inversión actualizada correctamente"
       destroy:
         spending_proposal: "Propuesta de inversión eliminada."
         budget_investment: "Propuesta de inversión eliminada."
+        error: "No se pudo borrar"
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
index 72aa390db..d96b9db27 100755
--- a/config/locales/settings.en.yml
+++ b/config/locales/settings.en.yml
@@ -19,6 +19,7 @@ en:
     twitter_hashtag: "Twitter hashtag"
     facebook_handle: "Facebook handle"
     youtube_handle: "Youtube handle"
+    telegram_handle: "Telegram handle"
     blog_url: "Blog URL"
     transparency_url: "Transparency URL"
     opendata_url: "Open Data URL"
@@ -31,6 +32,7 @@ en:
       facebook_login: Facebook login
       google_login: Google login
       debates: Debates
+      polls: Polls
       signature_sheets: Signature sheets
       spending_proposals: Investment projects
       spending_proposal_features:
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
index afb48d799..97ab56dc9 100644
--- a/config/locales/settings.es.yml
+++ b/config/locales/settings.es.yml
@@ -19,6 +19,7 @@ es:
     twitter_hashtag: "Hashtag para Twitter"
     facebook_handle: "Identificador de Facebook"
     youtube_handle: "Usuario de Youtube"
+    telegram_handle: "Usuario de Telegram"
     blog_url: "URL del blog"
     transparency_url: "URL de transparencia"
     opendata_url: "URL de open data"
@@ -31,6 +32,7 @@ es:
       facebook_login: Registro con Facebook
       google_login: Registro con Google
       debates: Debates
+      polls: Votaciones
       signature_sheets: Hojas de firmas
       spending_proposals: Propuestas de inversión
       spending_proposal_features:
diff --git a/config/locales/valuation.en.yml b/config/locales/valuation.en.yml
index de19fea09..56cf38f4c 100644
--- a/config/locales/valuation.en.yml
+++ b/config/locales/valuation.en.yml
@@ -1,6 +1,8 @@
 ---
 en:
   valuation:
+    header:
+      title: Valuation
     menu:
       title: Valuation
       budgets: Participatory budgets
diff --git a/config/locales/valuation.es.yml b/config/locales/valuation.es.yml
index b588c8521..e45b57e73 100644
--- a/config/locales/valuation.es.yml
+++ b/config/locales/valuation.es.yml
@@ -1,6 +1,8 @@
 ---
 es:
   valuation:
+    header:
+      title: Evaluación
     menu:
       title: Evaluación
       budgets: Presupuestos participativos
diff --git a/config/routes.rb b/config/routes.rb
index 63b04458b..c816eecac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,8 +61,6 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :proposal_ballots, only: [:index]
-
   resources :comments, only: [:create, :show], shallow: true do
     member do
       post :vote
@@ -95,6 +93,12 @@ Rails.application.routes.draw do
     get :search, on: :collection
   end
 
+  resources :polls, only: [:show, :index] do
+    resources :questions, only: [:show], controller: 'polls/questions', shallow: true do
+      post :answer, on: :member
+    end
+  end
+
   resources :users, only: [:show] do
     resources :direct_messages, only: [:new, :create, :show]
   end
@@ -202,6 +206,33 @@ Rails.application.routes.draw do
       get :search, on: :collection
     end
 
+    scope module: :poll do
+      resources :polls do
+        get :search_questions, on: :member
+        patch :add_question, on: :member
+        patch :remove_question, on: :member
+
+        resources :booth_assignments, only: [:index, :show, :create, :destroy] do
+          get :search_booths, on: :collection
+        end
+
+        resources :officer_assignments, only: [:index, :create, :destroy] do
+          get :search_officers, on: :collection
+          get :by_officer, on: :collection
+        end
+
+        resources :recounts, only: :index
+        resources :results, only: :index
+      end
+
+      resources :officers do
+        get :search, on: :collection
+      end
+
+      resources :booths
+      resources :questions
+    end
+
     resources :verifications, controller: :verifications, only: :index do
       get :search, on: :collection
     end
@@ -311,6 +342,19 @@ Rails.application.routes.draw do
     end
   end
 
+  namespace :officing do
+    resources :polls, only: [:index] do
+      get :final, on: :collection
+
+      resources :recounts, only: [:new, :create]
+      resources :final_recounts, only: [:new, :create]
+      resources :results, only: [:new, :create, :index]
+    end
+    resource :residence, controller: "residence", only: [:new, :create]
+    resources :voters, only: [:new, :create]
+    root to: "dashboard#index"
+  end
+
   if Rails.env.development?
     mount LetterOpenerWeb::Engine, at: "/letter_opener"
   end
diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb
index eb1651a0c..f7b2f2908 100644
--- a/db/dev_seeds.rb
+++ b/db/dev_seeds.rb
@@ -2,7 +2,7 @@ require 'database_cleaner'
 
 DatabaseCleaner.clean_with :truncation
 
-puts "Creating Settings"
+print "Creating Settings"
 Setting.create(key: 'official_level_1_name', value: 'Empleados públicos')
 Setting.create(key: 'official_level_2_name', value: 'Organización Municipal')
 Setting.create(key: 'official_level_3_name', value: 'Directores generales')
@@ -20,11 +20,13 @@ Setting.create(key: 'twitter_handle', value: '@consul_dev')
 Setting.create(key: 'twitter_hashtag', value: '#consul_dev')
 Setting.create(key: 'facebook_handle', value: 'consul')
 Setting.create(key: 'youtube_handle', value: 'consul')
+Setting.create(key: 'telegram_handle', value: 'consul')
 Setting.create(key: 'blog_url', value: '/blog')
 Setting.create(key: 'url', value: 'http://localhost:3000')
 Setting.create(key: 'org_name', value: 'Consul')
 Setting.create(key: 'place_name', value: 'City')
 Setting.create(key: 'feature.debates', value: "true")
+Setting.create(key: 'feature.polls', value: "true")
 Setting.create(key: 'feature.spending_proposals', value: nil)
 Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value: nil)
 Setting.create(key: 'feature.budgets', value: "true")
@@ -42,14 +44,18 @@ Setting.create(key: 'meta_keywords', value: 'citizen participation, open governm
 Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
 Setting.create(key: 'min_age_to_participate', value: '16')
 
-puts "Creating Geozones"
+puts " ✅"
+print "Creating Geozones"
+
+Geozone.create(name: "city")
+Geozone.create(name: "Existent District", census_code: "01")
 ('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }
 
-puts "Creating Users"
+puts " ✅"
+print "Creating Users"
 
 def create_user(email, username = Faker::Name.name)
   pwd = '12345678'
-  puts "    #{username}"
   User.create!(username: username, email: email, password: pwd, password_confirmation: pwd, confirmed_at: Time.current, terms_of_service: "1")
 end
 
@@ -66,6 +72,9 @@ manager.create_manager
 valuator = create_user('valuator@consul.dev', 'valuator')
 valuator.create_valuator
 
+poll_officer = create_user('poll_officer@consul.dev', 'Paul O. Fisher')
+poll_officer.create_poll_officer
+
 level_2 = create_user('leveltwo@consul.dev', 'level 2')
 level_2.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_number: "2222222222", document_type: "1" )
 
@@ -105,7 +114,8 @@ end
 org_user_ids = User.organizations.pluck(:id)
 not_org_users = User.where(['users.id NOT IN(?)', org_user_ids])
 
-puts "Creating Tags Categories"
+puts " ✅"
+print "Creating Tags Categories"
 
 ActsAsTaggableOn::Tag.create!(name:  "Asociaciones", featured: true, kind: "category")
 ActsAsTaggableOn::Tag.create!(name:  "Cultura", featured: true, kind: "category")
@@ -123,7 +133,8 @@ ActsAsTaggableOn::Tag.create!(name:  "Transparencia", featured: true, kind: "cat
 ActsAsTaggableOn::Tag.create!(name:  "Seguridad y Emergencias", featured: true, kind: "category")
 ActsAsTaggableOn::Tag.create!(name:  "Medio Ambiente", featured: true, kind: "category")
 
-puts "Creating Debates"
+puts " ✅"
+print "Creating Debates"
 
 tags = Faker::Lorem.words(25)
 (1..30).each do
@@ -136,7 +147,6 @@ tags = Faker::Lorem.words(25)
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
                           terms_of_service: "1")
-  puts "    #{debate.title}"
 end
 
 
@@ -151,11 +161,11 @@ tags = ActsAsTaggableOn::Tag.where(kind: 'category')
                           tag_list: tags.sample(3).join(','),
                           geozone: Geozone.reorder("RANDOM()").first,
                           terms_of_service: "1")
-  puts "    #{debate.title}"
 end
 
 
-puts "Creating Proposals"
+puts " ✅"
+print "Creating Proposals"
 
 tags = Faker::Lorem.words(25)
 (1..30).each do |i|
@@ -172,13 +182,33 @@ tags = Faker::Lorem.words(25)
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
-  puts "    #{proposal.title}"
 end
 
-puts "Creating Archived Proposals"
+puts " ✅"
+print "Creating Archived Proposals"
 
 tags = Faker::Lorem.words(25)
 (1..5).each do
+  author = User.reorder("RANDOM()").first
+  description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
+  proposal = Proposal.create!(author: author,
+                              title: Faker::Lorem.sentence(3).truncate(60),
+                              question: Faker::Lorem.sentence(3) + "?",
+                              summary: Faker::Lorem.sentence(3),
+                              responsible_name: Faker::Name.name,
+                              external_url: Faker::Internet.url,
+                              description: description,
+                              tag_list: tags.sample(3).join(','),
+                              geozone: Geozone.reorder("RANDOM()").first,
+                              terms_of_service: "1",
+                              created_at: Setting["months_to_archive_proposals"].to_i.months.ago)
+end
+
+puts " ✅"
+print "Creating Successful Proposals"
+
+tags = Faker::Lorem.words(25)
+(1..10).each do |i|
   author = User.reorder("RANDOM()").first
   description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
   proposal = Proposal.create!(author: author,
@@ -192,8 +222,7 @@ tags = Faker::Lorem.words(25)
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1",
-                              created_at: Setting["months_to_archive_proposals"].to_i.months.ago)
-  puts "    #{proposal.title}"
+                              cached_votes_up: Setting["votes_for_proposal_success"])
 end
 
 
@@ -212,11 +241,11 @@ tags = ActsAsTaggableOn::Tag.where(kind: 'category')
                               tag_list: tags.sample(3).join(','),
                               geozone: Geozone.reorder("RANDOM()").first,
                               terms_of_service: "1")
-  puts "    #{proposal.title}"
 end
 
 
-puts "Commenting Debates"
+puts " ✅"
+print "Commenting Debates"
 
 (1..100).each do
   author = User.reorder("RANDOM()").first
@@ -228,7 +257,8 @@ puts "Commenting Debates"
 end
 
 
-puts "Commenting Proposals"
+puts " ✅"
+print "Commenting Proposals"
 
 (1..100).each do |i|
   author = User.reorder("RANDOM()").first
@@ -240,7 +270,8 @@ puts "Commenting Proposals"
 end
 
 
-puts "Commenting Comments"
+puts " ✅"
+print "Commenting Comments"
 
 (1..200).each do
   author = User.reorder("RANDOM()").first
@@ -254,7 +285,8 @@ puts "Commenting Comments"
 end
 
 
-puts "Voting Debates, Proposals & Comments"
+puts " ✅"
+print "Voting Debates, Proposals & Comments"
 
 (1..100).each do
   voter  = not_org_users.reorder("RANDOM()").first
@@ -277,7 +309,8 @@ end
 end
 
 
-puts "Flagging Debates & Comments"
+puts " ✅"
+print "Flagging Debates & Comments"
 
 (1..40).each do
   debate = Debate.reorder("RANDOM()").first
@@ -297,7 +330,8 @@ end
   Flag.flag(flagger, proposal)
 end
 
-puts "Creating Spending Proposals"
+puts " ✅"
+print "Creating Spending Proposals"
 
 tags = Faker::Lorem.words(10)
 
@@ -320,17 +354,18 @@ tags = Faker::Lorem.words(10)
                               tag_list: tags.sample(3).join(','),
                               price: rand(1000000),
                               terms_of_service: "1")
-  puts "    #{spending_proposal.title}"
 end
 
-puts "Creating Valuation Assignments"
+puts " ✅"
+print "Creating Valuation Assignments"
 
 (1..17).to_a.sample.times do
   SpendingProposal.reorder("RANDOM()").first.valuators << valuator.valuator
 end
 
 
-puts "Creating Budgets"
+puts " ✅"
+print "Creating Budgets"
 
 Budget::PHASES.each_with_index do |phase, i|
   descriptions = Hash[Budget::PHASES.map{ |p| ["description_#{p}",
@@ -343,8 +378,6 @@ Budget::PHASES.each_with_index do |phase, i|
     )
   )
 
-  puts budget.name
-
   (1..([1, 2, 3].sample)).each do
     group = budget.groups.create!(name: Faker::StarWars.planet)
 
@@ -355,13 +388,12 @@ Budget::PHASES.each_with_index do |phase, i|
                                                price: rand(1 .. 100) * 100000)
 
     end
-    print "#{group.name} "
   end
-  puts ""
 end
 
 
-puts "Creating Investments"
+puts " ✅"
+print "Creating Investments"
 tags = Faker::Lorem.words(10)
 (1..100).each do |i|
   heading = Budget::Heading.reorder("RANDOM()").first
@@ -381,47 +413,53 @@ tags = Faker::Lorem.words(10)
     tag_list: tags.sample(3).join(','),
     price: rand(1 .. 100) * 100000,
     terms_of_service: "1")
-  puts "    #{investment.title}"
 end
 
-puts "Selecting Investments"
+puts " ✅"
+print "Selecting Investments"
 Budget.balloting.reorder("RANDOM()").limit(3).each do |budget|
   budget.investments.feasible.reorder("RANDOM()").limit(10).update_all(selected: true)
 end
 
-puts "Creating Valuation Assignments"
+puts " ✅"
+print "Creating Valuation Assignments"
 
 (1..50).to_a.sample.times do
   Budget::Investment.reorder("RANDOM()").first.valuators << valuator.valuator
 end
 
 
-puts "Creating Legislation"
+puts " ✅"
+print "Creating Legislation"
 
 Legislation.create!(title: 'Participatory Democracy', body: 'In order to achieve...')
 
 
-puts "Ignoring flags in Debates, comments & proposals"
+puts " ✅"
+print "Ignoring flags in Debates, comments & proposals"
 
 Debate.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag)
 Comment.flagged.reorder("RANDOM()").limit(30).each(&:ignore_flag)
 Proposal.flagged.reorder("RANDOM()").limit(10).each(&:ignore_flag)
 
 
-puts "Hiding debates, comments & proposals"
+puts " ✅"
+print "Hiding debates, comments & proposals"
 
 Comment.with_hidden.flagged.reorder("RANDOM()").limit(30).each(&:hide)
 Debate.with_hidden.flagged.reorder("RANDOM()").limit(5).each(&:hide)
 Proposal.with_hidden.flagged.reorder("RANDOM()").limit(10).each(&:hide)
 
 
-puts "Confirming hiding in debates, comments & proposals"
+puts " ✅"
+print "Confirming hiding in debates, comments & proposals"
 
 Comment.only_hidden.flagged.reorder("RANDOM()").limit(10).each(&:confirm_hide)
 Debate.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
 Proposal.only_hidden.flagged.reorder("RANDOM()").limit(5).each(&:confirm_hide)
 
-puts "Creating banners"
+puts " ✅"
+print "Creating banners"
 
 Proposal.last(3).each do |proposal|
   title = Faker::Lorem.sentence(word_count = 3)
@@ -436,5 +474,136 @@ Proposal.last(3).each do |proposal|
                           post_started_at: rand((Time.current - 1.week) .. (Time.current - 1.day)),
                           post_ended_at:   rand((Time.current  - 1.day) .. (Time.current + 1.week)),
                           created_at: rand((Time.current - 1.week) .. Time.current))
-  puts "    #{banner.title}"
 end
+
+puts " ✅"
+print "Creating polls"
+
+puts " ✅"
+print "Active Polls"
+(1..3).each do |i|
+  poll = Poll.create(name: "Active Poll #{i}",
+                     starts_at: 1.month.ago,
+                     ends_at:   1.month.from_now,
+                     geozone_restricted: false)
+end
+(4..5).each do |i|
+  poll = Poll.create(name: "Active Poll #{i}",
+                     starts_at: 1.month.ago,
+                     ends_at:   1.month.from_now,
+                     geozone_restricted: true,
+                     geozones: Geozone.reorder("RANDOM()").limit(3)
+                    )
+end
+
+
+
+
+
+puts " ✅"
+print "Upcoming Poll"
+poll = Poll.create(name: "Upcoming Poll",
+                   starts_at: 1.month.from_now,
+                   ends_at:   2.months.from_now)
+
+puts " ✅"
+print "Expired Poll"
+poll = Poll.create(name: "Expired Poll",
+                     starts_at: 2.months.ago,
+                     ends_at:   1.months.ago)
+
+puts " ✅"
+print "Creating Poll Questions"
+
+(1..50).each do |i|
+  poll = Poll.reorder("RANDOM()").first
+  author = User.reorder("RANDOM()").first
+  description = "<p>#{Faker::Lorem.paragraphs.join('</p><p>')}</p>"
+  open_at = rand(2.months.ago .. 2.months.from_now)
+  question = Poll::Question.create!(author: author,
+                                    title: Faker::Lorem.sentence(3).truncate(60),
+                                    description: description,
+                                    valid_answers: Faker::Lorem.words((2..7).to_a.sample).join(', '),
+                                    poll: poll)
+end
+
+puts " ✅"
+print "Creating Poll Booths"
+30.times.each_with_index do |i|
+  Poll::Booth.create(name: "Booth #{i}", polls: [Poll.all.sample])
+end
+
+puts " ✅"
+print "Creating Booth Assignments"
+Poll::Booth.all.each do |booth|
+  Poll::BoothAssignment.create(booth: booth, poll: Poll.all.sample)
+end
+
+puts " ✅"
+print "Creating Poll Officer Assignments"
+(1..15).to_a.sample.times do |i|
+  Poll::BoothAssignment.all.sample(i).each do |booth_assignment|
+    Poll::OfficerAssignment.create(officer: poll_officer.poll_officer,
+                                   booth_assignment: booth_assignment,
+                                   date: booth_assignment.poll.starts_at)
+  end
+end
+
+puts " ✅"
+print "Creating Poll Recounts" do
+(1..15).to_a.sample.times do |i|
+  poll_officer.poll_officer.officer_assignments.all.sample(i).each do |officer_assignment|
+    Poll::Recount.create(officer_assignment: officer_assignment,
+                         booth_assignment: officer_assignment.booth_assignment,
+                         date: officer_assignment.date,
+                         count: (1..5000).to_a.sample)
+  end
+end
+
+end
+
+puts " ✅"
+print "Creating Poll Questions from Proposals"
+
+(1..3).each do
+  proposal = Proposal.reorder("RANDOM()").first
+  poll = Poll.current.first
+  question = Poll::Question.create(valid_answers: "Yes, No")
+  question.copy_attributes_from_proposal(proposal)
+  question.save!
+end
+
+puts " ✅"
+print "Creating Successful Proposals"
+
+(1..10).each do
+  proposal = Proposal.reorder("RANDOM()").first
+  poll = Poll.current.first
+  question = Poll::Question.create(valid_answers: "Yes, No")
+  question.copy_attributes_from_proposal(proposal)
+  question.save!
+end
+
+puts " ✅"
+print "Commenting Poll Questions"
+
+(1..30).each do
+  author = User.reorder("RANDOM()").first
+  question = Poll::Question.reorder("RANDOM()").first
+  Comment.create!(user: author,
+                  created_at: rand(question.created_at .. Time.current),
+                  commentable: question,
+                  body: Faker::Lorem.sentence)
+end
+
+puts " ✅"
+print "Creating Poll Voters"
+
+(1..10).each do
+  poll = Poll.all.sample
+  user = User.level_two_verified.sample
+  Poll::Voter.create(poll: poll, user: user)
+end
+
+puts " ✅"
+puts "All dev seeds created successfuly 👍"
diff --git a/db/migrate/20160914110004_create_polls.rb b/db/migrate/20160914110004_create_polls.rb
new file mode 100644
index 000000000..9dd67d9ba
--- /dev/null
+++ b/db/migrate/20160914110004_create_polls.rb
@@ -0,0 +1,7 @@
+class CreatePolls < ActiveRecord::Migration
+  def change
+    create_table :polls do |t|
+      t.string :name
+    end
+  end
+end
diff --git a/db/migrate/20160914110039_create_poll_officers.rb b/db/migrate/20160914110039_create_poll_officers.rb
new file mode 100644
index 000000000..329220d40
--- /dev/null
+++ b/db/migrate/20160914110039_create_poll_officers.rb
@@ -0,0 +1,7 @@
+class CreatePollOfficers < ActiveRecord::Migration
+  def change
+    create_table :poll_officers do |t|
+      t.integer :user_id
+    end
+  end
+end
diff --git a/db/migrate/20160914172016_create_poll_voters.rb b/db/migrate/20160914172016_create_poll_voters.rb
new file mode 100644
index 000000000..df5bb4585
--- /dev/null
+++ b/db/migrate/20160914172016_create_poll_voters.rb
@@ -0,0 +1,9 @@
+class CreatePollVoters < ActiveRecord::Migration
+  def change
+    create_table :poll_voters do |t|
+      t.integer :booth_id
+      t.string :document_number
+      t.string :document_type
+    end
+  end
+end
diff --git a/db/migrate/20160914172535_create_poll_booths.rb b/db/migrate/20160914172535_create_poll_booths.rb
new file mode 100644
index 000000000..a474aba49
--- /dev/null
+++ b/db/migrate/20160914172535_create_poll_booths.rb
@@ -0,0 +1,8 @@
+class CreatePollBooths < ActiveRecord::Migration
+  def change
+    create_table :poll_booths do |t|
+      t.string :name
+      t.integer :poll_id
+    end
+  end
+end
diff --git a/db/migrate/20160926090107_add_location_to_booths.rb b/db/migrate/20160926090107_add_location_to_booths.rb
new file mode 100644
index 000000000..146f55d41
--- /dev/null
+++ b/db/migrate/20160926090107_add_location_to_booths.rb
@@ -0,0 +1,5 @@
+class AddLocationToBooths < ActiveRecord::Migration
+  def change
+    add_column :poll_booths, :location, :string
+  end
+end
diff --git a/db/migrate/20160928113143_create_officing_booths.rb b/db/migrate/20160928113143_create_officing_booths.rb
new file mode 100644
index 000000000..00483fe00
--- /dev/null
+++ b/db/migrate/20160928113143_create_officing_booths.rb
@@ -0,0 +1,9 @@
+class CreateOfficingBooths < ActiveRecord::Migration
+  def change
+    create_table :poll_officing_booths do |t|
+      t.belongs_to :officer
+      t.belongs_to :booth
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20161020112156_add_dates_to_polls.rb b/db/migrate/20161020112156_add_dates_to_polls.rb
new file mode 100644
index 000000000..d504930ae
--- /dev/null
+++ b/db/migrate/20161020112156_add_dates_to_polls.rb
@@ -0,0 +1,6 @@
+class AddDatesToPolls < ActiveRecord::Migration
+  def change
+    add_column :polls, :starts_at, :datetime
+    add_column :polls, :ends_at, :datetime
+  end
+end
diff --git a/db/migrate/20161028104156_create_poll_questions.rb b/db/migrate/20161028104156_create_poll_questions.rb
new file mode 100644
index 000000000..13c8ac1e8
--- /dev/null
+++ b/db/migrate/20161028104156_create_poll_questions.rb
@@ -0,0 +1,21 @@
+class CreatePollQuestions < ActiveRecord::Migration
+  def change
+    create_table :poll_questions do |t|
+      t.references :proposal, index: true, foreign_key: true
+      t.references :poll, index: true, foreign_key: true
+      t.references :author, index: true # foreign key added later due to rails 4
+      t.string :author_visible_name
+      t.string :title
+      t.string :question
+      t.string :summary
+      t.string :valid_answers
+      t.text :description
+      t.integer :comments_count
+      t.datetime :hidden_at
+
+      t.timestamps
+    end
+
+    add_foreign_key :poll_questions, :users, column: :author_id
+  end
+end
diff --git a/db/migrate/20161028143204_create_geozones_poll_questions.rb b/db/migrate/20161028143204_create_geozones_poll_questions.rb
new file mode 100644
index 000000000..68077c510
--- /dev/null
+++ b/db/migrate/20161028143204_create_geozones_poll_questions.rb
@@ -0,0 +1,10 @@
+class CreateGeozonesPollQuestions < ActiveRecord::Migration
+  def change
+    create_table :geozones_poll_questions do |t|
+      t.references :geozone, index: true, foreign_key: true
+      t.integer :question_id, index: true
+    end
+
+    add_foreign_key :geozones_poll_questions, :poll_questions, column: :question_id
+  end
+end
diff --git a/db/migrate/20161107124207_add_all_geozones_to_poll_questions.rb b/db/migrate/20161107124207_add_all_geozones_to_poll_questions.rb
new file mode 100644
index 000000000..15ed41ba5
--- /dev/null
+++ b/db/migrate/20161107124207_add_all_geozones_to_poll_questions.rb
@@ -0,0 +1,5 @@
+class AddAllGeozonesToPollQuestions < ActiveRecord::Migration
+  def change
+    add_column :poll_questions, :all_geozones, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20161107174423_create_poll_partial_result.rb b/db/migrate/20161107174423_create_poll_partial_result.rb
new file mode 100644
index 000000000..a4f91a4f9
--- /dev/null
+++ b/db/migrate/20161107174423_create_poll_partial_result.rb
@@ -0,0 +1,14 @@
+class CreatePollPartialResult < ActiveRecord::Migration
+  def change
+    create_table :poll_partial_results do |t|
+      t.integer :question_id, index: true
+      t.integer :author_id, index: true
+      t.string :answer, index: true
+      t.integer :amount
+      t.string :origin, index: true
+    end
+
+    add_foreign_key(:poll_partial_results, :users, column: :author_id)
+    add_foreign_key(:poll_partial_results, :poll_questions, column: :question_id)
+  end
+end
diff --git a/db/migrate/20161122101702_remove_question_from_poll_questions.rb b/db/migrate/20161122101702_remove_question_from_poll_questions.rb
new file mode 100644
index 000000000..2532b2948
--- /dev/null
+++ b/db/migrate/20161122101702_remove_question_from_poll_questions.rb
@@ -0,0 +1,5 @@
+class RemoveQuestionFromPollQuestions < ActiveRecord::Migration
+  def change
+    remove_column :poll_questions, :question
+  end
+end
diff --git a/db/migrate/20161129011737_add_tsv_to_poll_questions.rb b/db/migrate/20161129011737_add_tsv_to_poll_questions.rb
new file mode 100644
index 000000000..a6a44f13d
--- /dev/null
+++ b/db/migrate/20161129011737_add_tsv_to_poll_questions.rb
@@ -0,0 +1,11 @@
+class AddTsvToPollQuestions < ActiveRecord::Migration
+  def up
+    add_column :poll_questions, :tsv, :tsvector
+    add_index :poll_questions, :tsv, using: "gin"
+  end
+
+  def down
+    remove_index :poll_questions, :tsv
+    remove_column :poll_questions, :tsv
+  end
+end
diff --git a/db/migrate/20161130122604_remove_poll_id_from_booth.rb b/db/migrate/20161130122604_remove_poll_id_from_booth.rb
new file mode 100644
index 000000000..a84b1a70a
--- /dev/null
+++ b/db/migrate/20161130122604_remove_poll_id_from_booth.rb
@@ -0,0 +1,5 @@
+class RemovePollIdFromBooth < ActiveRecord::Migration
+  def change
+    remove_column :poll_booths, :poll_id, :integer
+  end
+end
diff --git a/db/migrate/20161130123347_create_poll_booth_assignments.rb b/db/migrate/20161130123347_create_poll_booth_assignments.rb
new file mode 100644
index 000000000..36a2b9d64
--- /dev/null
+++ b/db/migrate/20161130123347_create_poll_booth_assignments.rb
@@ -0,0 +1,9 @@
+class CreatePollBoothAssignments < ActiveRecord::Migration
+  def change
+    create_table :poll_booth_assignments do |t|
+      t.integer :booth_id
+      t.integer :poll_id
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20161206130836_delete_officing_booths.rb b/db/migrate/20161206130836_delete_officing_booths.rb
new file mode 100644
index 000000000..2ef1180ab
--- /dev/null
+++ b/db/migrate/20161206130836_delete_officing_booths.rb
@@ -0,0 +1,8 @@
+class DeleteOfficingBooths < ActiveRecord::Migration
+  def self.up
+    drop_table :poll_officing_booths
+  end
+
+  def self.down
+  end
+end
diff --git a/db/migrate/20161206131125_create_poll_officer_assignments.rb b/db/migrate/20161206131125_create_poll_officer_assignments.rb
new file mode 100644
index 000000000..f3a40017c
--- /dev/null
+++ b/db/migrate/20161206131125_create_poll_officer_assignments.rb
@@ -0,0 +1,9 @@
+class CreatePollOfficerAssignments < ActiveRecord::Migration
+  def change
+    create_table :poll_officer_assignments do |t|
+      t.integer :booth_assignment_id
+      t.integer :officer_id
+      t.timestamps null: false
+    end
+  end
+end
diff --git a/db/migrate/20161206132126_rename_booth_id_to_booth_assignment_id.rb b/db/migrate/20161206132126_rename_booth_id_to_booth_assignment_id.rb
new file mode 100644
index 000000000..a1b59c749
--- /dev/null
+++ b/db/migrate/20161206132126_rename_booth_id_to_booth_assignment_id.rb
@@ -0,0 +1,10 @@
+class RenameBoothIdToBoothAssignmentId < ActiveRecord::Migration
+  def change
+    remove_column :poll_voters, :booth_id,            :integer
+
+    add_column    :poll_voters, :booth_assignment_id, :integer,  null: false
+    add_column    :poll_voters, :poll_id,             :integer,  null: false
+    add_column    :poll_voters, :created_at,          :datetime, null: false
+    add_column    :poll_voters, :updated_at,          :datetime, null: false
+  end
+end
diff --git a/db/migrate/20161207181001_remove_poll_id_from_voter.rb b/db/migrate/20161207181001_remove_poll_id_from_voter.rb
new file mode 100644
index 000000000..5a7012460
--- /dev/null
+++ b/db/migrate/20161207181001_remove_poll_id_from_voter.rb
@@ -0,0 +1,5 @@
+class RemovePollIdFromVoter < ActiveRecord::Migration
+  def change
+    remove_column :poll_voters, :poll_id, :integer
+  end
+end
diff --git a/db/migrate/20161227140109_add_date_to_officer_assignment.rb b/db/migrate/20161227140109_add_date_to_officer_assignment.rb
new file mode 100644
index 000000000..b7c88a37b
--- /dev/null
+++ b/db/migrate/20161227140109_add_date_to_officer_assignment.rb
@@ -0,0 +1,5 @@
+class AddDateToOfficerAssignment < ActiveRecord::Migration
+  def change
+    add_column :poll_officer_assignments, :date, :datetime
+  end
+end
diff --git a/db/migrate/20170102114446_create_poll_recounts.rb b/db/migrate/20170102114446_create_poll_recounts.rb
new file mode 100644
index 000000000..9643f5b0a
--- /dev/null
+++ b/db/migrate/20170102114446_create_poll_recounts.rb
@@ -0,0 +1,15 @@
+class CreatePollRecounts < ActiveRecord::Migration
+  def change
+    create_table :poll_recounts do |t|
+      t.integer :booth_assignment_id
+      t.integer :officer_assignment_id
+      t.integer :count
+      t.text    :count_log, default: ""
+
+      t.timestamps null: false
+    end
+
+    add_index :poll_recounts, :booth_assignment_id
+    add_index :poll_recounts, :officer_assignment_id
+  end
+end
diff --git a/db/migrate/20170102170125_add_published_to_polls.rb b/db/migrate/20170102170125_add_published_to_polls.rb
new file mode 100644
index 000000000..51da03f34
--- /dev/null
+++ b/db/migrate/20170102170125_add_published_to_polls.rb
@@ -0,0 +1,5 @@
+class AddPublishedToPolls < ActiveRecord::Migration
+  def change
+    add_column :polls, :published, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20170103191711_add_date_and_officer_assignment_log_to_poll_recounts.rb b/db/migrate/20170103191711_add_date_and_officer_assignment_log_to_poll_recounts.rb
new file mode 100644
index 000000000..e0f813500
--- /dev/null
+++ b/db/migrate/20170103191711_add_date_and_officer_assignment_log_to_poll_recounts.rb
@@ -0,0 +1,6 @@
+class AddDateAndOfficerAssignmentLogToPollRecounts < ActiveRecord::Migration
+  def change
+    add_column :poll_recounts, :date, :datetime
+    add_column :poll_recounts, :officer_assignment_id_log, :text, default: ""
+  end
+end
diff --git a/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb
new file mode 100644
index 000000000..a2606c370
--- /dev/null
+++ b/db/migrate/20170120153244_move_geozones_from_poll_questions_to_polls.rb
@@ -0,0 +1,10 @@
+class MoveGeozonesFromPollQuestionsToPolls < ActiveRecord::Migration
+  def change
+    drop_table :geozones_poll_questions
+
+    create_table :geozones_polls do |t|
+      t.references :geozone, index: true, foreign_key: true
+      t.references :poll, index: true, foreign_key: true
+    end
+  end
+end
diff --git a/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb b/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb
new file mode 100644
index 000000000..d6ed3a2c7
--- /dev/null
+++ b/db/migrate/20170120161058_add_geozone_restricted_to_polls.rb
@@ -0,0 +1,5 @@
+class AddGeozoneRestrictedToPolls < ActiveRecord::Migration
+  def change
+    add_column :polls, :geozone_restricted, :boolean, default: false, index: true
+  end
+end
diff --git a/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb b/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb
new file mode 100644
index 000000000..b4fcecd20
--- /dev/null
+++ b/db/migrate/20170120164547_remove_all_geozones_from_poll_questions.rb
@@ -0,0 +1,5 @@
+class RemoveAllGeozonesFromPollQuestions < ActiveRecord::Migration
+  def change
+    remove_column :poll_questions, :all_geozones, :boolean
+  end
+end
diff --git a/db/migrate/20170125104542_add_poll_id_and_stats_fields_to_poll_voter.rb b/db/migrate/20170125104542_add_poll_id_and_stats_fields_to_poll_voter.rb
new file mode 100644
index 000000000..84e7de5d9
--- /dev/null
+++ b/db/migrate/20170125104542_add_poll_id_and_stats_fields_to_poll_voter.rb
@@ -0,0 +1,12 @@
+class AddPollIdAndStatsFieldsToPollVoter < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :poll_id, :integer,  null: false
+
+    remove_column :poll_voters, :booth_assignment_id, :integer, null: false
+    add_column :poll_voters, :booth_assignment_id, :integer
+
+    add_column :poll_voters, :age, :integer
+    add_column :poll_voters, :gender, :string
+    add_column :poll_voters, :geozone_id, :integer
+  end
+end
diff --git a/db/migrate/20170125112017_create_poll_answers.rb b/db/migrate/20170125112017_create_poll_answers.rb
new file mode 100644
index 000000000..7ea930d0c
--- /dev/null
+++ b/db/migrate/20170125112017_create_poll_answers.rb
@@ -0,0 +1,15 @@
+class CreatePollAnswers < ActiveRecord::Migration
+  def change
+    create_table :poll_answers do |t|
+      t.integer :question_id
+      t.integer :author_id
+      t.string :answer
+
+      t.timestamps
+    end
+
+    add_index :poll_answers, :question_id
+    add_index :poll_answers, :author_id
+    add_index :poll_answers, [:question_id, :answer]
+  end
+end
diff --git a/db/migrate/20170125114952_add_answer_id_to_poll_voters.rb b/db/migrate/20170125114952_add_answer_id_to_poll_voters.rb
new file mode 100644
index 000000000..34d5bbc54
--- /dev/null
+++ b/db/migrate/20170125114952_add_answer_id_to_poll_voters.rb
@@ -0,0 +1,9 @@
+class AddAnswerIdToPollVoters < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :answer_id, :integer, default: nil
+
+    add_index :poll_voters, :document_number
+    add_index :poll_voters, :poll_id
+    add_index :poll_voters, [:poll_id, :document_number, :document_type], name: 'doc_by_poll'
+  end
+end
diff --git a/db/migrate/20170127173553_add_officer_assignment_to_votes.rb b/db/migrate/20170127173553_add_officer_assignment_to_votes.rb
new file mode 100644
index 000000000..1942ef08f
--- /dev/null
+++ b/db/migrate/20170127173553_add_officer_assignment_to_votes.rb
@@ -0,0 +1,5 @@
+class AddOfficerAssignmentToVotes < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :officer_assignment_id, :integer, default: nil
+  end
+end
diff --git a/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb b/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb
new file mode 100644
index 000000000..edf635cfc
--- /dev/null
+++ b/db/migrate/20170128214244_adds_user_id_to_poll_voters.rb
@@ -0,0 +1,5 @@
+class AddsUserIdToPollVoters < ActiveRecord::Migration
+  def change
+    add_reference :poll_voters, :user, index: true
+  end
+end
diff --git a/db/migrate/20170130101121_create_poll_final_recount.rb b/db/migrate/20170130101121_create_poll_final_recount.rb
new file mode 100644
index 000000000..07723b708
--- /dev/null
+++ b/db/migrate/20170130101121_create_poll_final_recount.rb
@@ -0,0 +1,15 @@
+class CreatePollFinalRecount < ActiveRecord::Migration
+  def change
+    create_table :poll_final_recounts do |t|
+      t.integer  :booth_assignment_id
+      t.integer  :officer_assignment_id
+      t.integer  :count
+      t.text     :count_log, default: ""
+      t.datetime :created_at, null: false
+      t.datetime :updated_at, null: false
+      t.text     :officer_assignment_id_log, default: ""
+    end
+
+    add_index :poll_final_recounts, :booth_assignment_id
+  end
+end
diff --git a/db/migrate/20170130103550_add_final_to_poll_officer_assignments.rb b/db/migrate/20170130103550_add_final_to_poll_officer_assignments.rb
new file mode 100644
index 000000000..4cafb5ffb
--- /dev/null
+++ b/db/migrate/20170130103550_add_final_to_poll_officer_assignments.rb
@@ -0,0 +1,5 @@
+class AddFinalToPollOfficerAssignments < ActiveRecord::Migration
+  def change
+    add_column :poll_officer_assignments, :final, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20170130133736_add_date_to_final_recount.rb b/db/migrate/20170130133736_add_date_to_final_recount.rb
new file mode 100644
index 000000000..14d0f564c
--- /dev/null
+++ b/db/migrate/20170130133736_add_date_to_final_recount.rb
@@ -0,0 +1,5 @@
+class AddDateToFinalRecount < ActiveRecord::Migration
+  def change
+    add_column :poll_final_recounts, :date, :datetime, null: false
+  end
+end
diff --git a/db/migrate/20170130163030_change_datetimes_to_date_in_recounts_and_assignments.rb b/db/migrate/20170130163030_change_datetimes_to_date_in_recounts_and_assignments.rb
new file mode 100644
index 000000000..2ef6d0d5a
--- /dev/null
+++ b/db/migrate/20170130163030_change_datetimes_to_date_in_recounts_and_assignments.rb
@@ -0,0 +1,13 @@
+class ChangeDatetimesToDateInRecountsAndAssignments < ActiveRecord::Migration
+  def up
+    change_column :poll_recounts, :date, :date, null: false
+    change_column :poll_final_recounts, :date, :date, null: false
+    change_column :poll_officer_assignments, :date, :date, null: false
+  end
+
+  def down
+    change_column :poll_recounts, :date, :datetime, null: false
+    change_column :poll_final_recounts, :date, :datetime, null: false
+    change_column :poll_officer_assignments, :date, :datetime, null: false
+  end
+end
diff --git a/db/migrate/20170130171322_remove_summary_from_poll_question.rb b/db/migrate/20170130171322_remove_summary_from_poll_question.rb
new file mode 100644
index 000000000..02c5fb68e
--- /dev/null
+++ b/db/migrate/20170130171322_remove_summary_from_poll_question.rb
@@ -0,0 +1,5 @@
+class RemoveSummaryFromPollQuestion < ActiveRecord::Migration
+  def change
+    remove_column :poll_questions, :summary
+  end
+end
diff --git a/db/migrate/20170201113206_adds_fields_to_poll_partial_results.rb b/db/migrate/20170201113206_adds_fields_to_poll_partial_results.rb
new file mode 100644
index 000000000..3755dc700
--- /dev/null
+++ b/db/migrate/20170201113206_adds_fields_to_poll_partial_results.rb
@@ -0,0 +1,9 @@
+class AddsFieldsToPollPartialResults < ActiveRecord::Migration
+  def change
+    add_column :poll_partial_results, :date, :date
+    add_column :poll_partial_results, :booth_assignment_id, :integer
+    add_column :poll_partial_results, :officer_assignment_id, :integer
+
+    add_index :poll_partial_results, [:booth_assignment_id, :date]
+  end
+end
diff --git a/db/migrate/20170202151151_add_log_fields_to_poll_partial_results.rb b/db/migrate/20170202151151_add_log_fields_to_poll_partial_results.rb
new file mode 100644
index 000000000..86966aed4
--- /dev/null
+++ b/db/migrate/20170202151151_add_log_fields_to_poll_partial_results.rb
@@ -0,0 +1,7 @@
+class AddLogFieldsToPollPartialResults < ActiveRecord::Migration
+  def change
+    add_column :poll_partial_results, :amount_log, :text, default: ""
+    add_column :poll_partial_results, :officer_assignment_id_log, :text, default: ""
+    add_column :poll_partial_results, :author_id_log, :text, default: ""
+  end
+end
diff --git a/db/migrate/20170203163304_create_poll_white_results.rb b/db/migrate/20170203163304_create_poll_white_results.rb
new file mode 100644
index 000000000..2ebfc93b1
--- /dev/null
+++ b/db/migrate/20170203163304_create_poll_white_results.rb
@@ -0,0 +1,18 @@
+class CreatePollWhiteResults < ActiveRecord::Migration
+  def change
+    create_table :poll_white_results do |t|
+      t.integer :author_id
+      t.integer :amount
+      t.string  :origin
+      t.date    :date
+      t.integer :booth_assignment_id
+      t.integer :officer_assignment_id
+      t.text    :amount_log,                default: ""
+      t.text    :officer_assignment_id_log, default: ""
+      t.text    :author_id_log,             default: ""
+    end
+
+    add_index :poll_white_results, :officer_assignment_id
+    add_index :poll_white_results, :booth_assignment_id
+  end
+end
diff --git a/db/migrate/20170203163317_create_poll_null_results.rb b/db/migrate/20170203163317_create_poll_null_results.rb
new file mode 100644
index 000000000..9c138cf65
--- /dev/null
+++ b/db/migrate/20170203163317_create_poll_null_results.rb
@@ -0,0 +1,18 @@
+class CreatePollNullResults < ActiveRecord::Migration
+  def change
+    create_table :poll_null_results do |t|
+      t.integer :author_id
+      t.integer :amount
+      t.string  :origin
+      t.date    :date
+      t.integer :booth_assignment_id
+      t.integer :officer_assignment_id
+      t.text    :amount_log,                default: ""
+      t.text    :officer_assignment_id_log, default: ""
+      t.text    :author_id_log,             default: ""
+    end
+
+    add_index :poll_null_results, :officer_assignment_id
+    add_index :poll_null_results, :booth_assignment_id
+  end
+end
diff --git a/db/migrate/20170208110146_add_officer_id_to_failed_census_calls.rb b/db/migrate/20170208110146_add_officer_id_to_failed_census_calls.rb
new file mode 100644
index 000000000..6ce289bec
--- /dev/null
+++ b/db/migrate/20170208110146_add_officer_id_to_failed_census_calls.rb
@@ -0,0 +1,6 @@
+class AddOfficerIdToFailedCensusCalls < ActiveRecord::Migration
+  def change
+    add_column :failed_census_calls, :poll_officer_id, :integer, index: true
+    add_foreign_key :failed_census_calls, :poll_officers
+  end
+end
diff --git a/db/migrate/20170208111639_add_failed_census_calls_count_to_poll_officers.rb b/db/migrate/20170208111639_add_failed_census_calls_count_to_poll_officers.rb
new file mode 100644
index 000000000..664c51749
--- /dev/null
+++ b/db/migrate/20170208111639_add_failed_census_calls_count_to_poll_officers.rb
@@ -0,0 +1,5 @@
+class AddFailedCensusCallsCountToPollOfficers < ActiveRecord::Migration
+  def change
+    add_column :poll_officers, :failed_census_calls_count, :integer, default: 0
+  end
+end
diff --git a/db/migrate/20170208112814_add_year_of_birth_to_failed_census_calls.rb b/db/migrate/20170208112814_add_year_of_birth_to_failed_census_calls.rb
new file mode 100644
index 000000000..a3fb5c96a
--- /dev/null
+++ b/db/migrate/20170208112814_add_year_of_birth_to_failed_census_calls.rb
@@ -0,0 +1,5 @@
+class AddYearOfBirthToFailedCensusCalls < ActiveRecord::Migration
+  def change
+    add_column :failed_census_calls, :year_of_birth, :integer
+  end
+end
diff --git a/db/migrate/20170208114548_add_user_data_log_to_poll_officer_assignments.rb b/db/migrate/20170208114548_add_user_data_log_to_poll_officer_assignments.rb
new file mode 100644
index 000000000..93c2efd8b
--- /dev/null
+++ b/db/migrate/20170208114548_add_user_data_log_to_poll_officer_assignments.rb
@@ -0,0 +1,5 @@
+class AddUserDataLogToPollOfficerAssignments < ActiveRecord::Migration
+  def change
+    add_column :poll_officer_assignments, :user_data_log, :string, default: ""
+  end
+end
diff --git a/db/migrate/20170208160130_add_former_users_data_log_to_users.rb b/db/migrate/20170208160130_add_former_users_data_log_to_users.rb
new file mode 100644
index 000000000..2cd3ca956
--- /dev/null
+++ b/db/migrate/20170208160130_add_former_users_data_log_to_users.rb
@@ -0,0 +1,5 @@
+class AddFormerUsersDataLogToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :former_users_data_log, :text, default: ""
+  end
+end
diff --git a/db/migrate/20170212123435_add_polls_related_indexes.rb b/db/migrate/20170212123435_add_polls_related_indexes.rb
new file mode 100644
index 000000000..f1a667432
--- /dev/null
+++ b/db/migrate/20170212123435_add_polls_related_indexes.rb
@@ -0,0 +1,36 @@
+class AddPollsRelatedIndexes < ActiveRecord::Migration
+  def change
+
+    add_index :poll_booth_assignments, :booth_id
+    add_index :poll_booth_assignments, :poll_id
+
+    add_index :poll_final_recounts, :officer_assignment_id
+
+    add_index :poll_officer_assignments, :booth_assignment_id
+    add_index :poll_officer_assignments, :officer_id
+    add_index :poll_officer_assignments, [:officer_id, :date]
+
+    add_index :poll_officers, :user_id
+
+    add_index :poll_voters, :booth_assignment_id
+    add_index :poll_voters, :officer_assignment_id
+
+    add_index :polls, [:starts_at, :ends_at]
+
+
+    add_foreign_key :poll_answers, :poll_questions, column: :question_id
+    add_foreign_key :poll_booth_assignments, :polls
+    add_foreign_key :poll_final_recounts, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_final_recounts, :poll_officer_assignments, column: :officer_assignment_id
+    add_foreign_key :poll_null_results, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_null_results, :poll_officer_assignments, column: :officer_assignment_id
+    add_foreign_key :poll_white_results, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_white_results, :poll_officer_assignments, column: :officer_assignment_id
+    add_foreign_key :poll_officer_assignments, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_partial_results, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_partial_results, :poll_officer_assignments, column: :officer_assignment_id
+    add_foreign_key :poll_voters, :polls
+    add_foreign_key :poll_recounts, :poll_booth_assignments, column: :booth_assignment_id
+    add_foreign_key :poll_recounts, :poll_officer_assignments, column: :officer_assignment_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e92a4121c..1227f8675 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -220,10 +220,10 @@ ActiveRecord::Schema.define(version: 20170324101716) do
     t.string   "visit_id"
     t.datetime "hidden_at"
     t.integer  "flags_count",                             default: 0
-    t.datetime "ignored_flag_at"
     t.integer  "cached_votes_total",                      default: 0
     t.integer  "cached_votes_up",                         default: 0
     t.integer  "cached_votes_down",                       default: 0
+    t.datetime "ignored_flag_at"
     t.integer  "comments_count",                          default: 0
     t.datetime "confirmed_hide_at"
     t.integer  "cached_anonymous_votes_total",            default: 0
@@ -282,6 +282,8 @@ ActiveRecord::Schema.define(version: 20170324101716) do
     t.datetime "created_at",      null: false
     t.datetime "updated_at",      null: false
     t.string   "district_code"
+    t.integer  "poll_officer_id"
+    t.integer  "year_of_birth"
   end
 
   add_index "failed_census_calls", ["user_id"], name: "index_failed_census_calls_on_user_id", using: :btree
@@ -307,6 +309,14 @@ ActiveRecord::Schema.define(version: 20170324101716) do
     t.string   "census_code"
   end
 
+  create_table "geozones_polls", force: :cascade do |t|
+    t.integer "geozone_id"
+    t.integer "poll_id"
+  end
+
+  add_index "geozones_polls", ["geozone_id"], name: "index_geozones_polls_on_geozone_id", using: :btree
+  add_index "geozones_polls", ["poll_id"], name: "index_geozones_polls_on_poll_id", using: :btree
+
   create_table "identities", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "provider"
@@ -366,6 +376,184 @@ ActiveRecord::Schema.define(version: 20170324101716) do
 
   add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
 
+  create_table "poll_answers", force: :cascade do |t|
+    t.integer  "question_id"
+    t.integer  "author_id"
+    t.string   "answer"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "poll_answers", ["author_id"], name: "index_poll_answers_on_author_id", using: :btree
+  add_index "poll_answers", ["question_id", "answer"], name: "index_poll_answers_on_question_id_and_answer", using: :btree
+  add_index "poll_answers", ["question_id"], name: "index_poll_answers_on_question_id", using: :btree
+
+  create_table "poll_booth_assignments", force: :cascade do |t|
+    t.integer  "booth_id"
+    t.integer  "poll_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "poll_booth_assignments", ["booth_id"], name: "index_poll_booth_assignments_on_booth_id", using: :btree
+  add_index "poll_booth_assignments", ["poll_id"], name: "index_poll_booth_assignments_on_poll_id", using: :btree
+
+  create_table "poll_booths", force: :cascade do |t|
+    t.string "name"
+    t.string "location"
+  end
+
+  create_table "poll_final_recounts", force: :cascade do |t|
+    t.integer  "booth_assignment_id"
+    t.integer  "officer_assignment_id"
+    t.integer  "count"
+    t.text     "count_log",                 default: ""
+    t.datetime "created_at",                             null: false
+    t.datetime "updated_at",                             null: false
+    t.text     "officer_assignment_id_log", default: ""
+    t.date     "date",                                   null: false
+  end
+
+  add_index "poll_final_recounts", ["booth_assignment_id"], name: "index_poll_final_recounts_on_booth_assignment_id", using: :btree
+  add_index "poll_final_recounts", ["officer_assignment_id"], name: "index_poll_final_recounts_on_officer_assignment_id", using: :btree
+
+  create_table "poll_null_results", force: :cascade do |t|
+    t.integer "author_id"
+    t.integer "amount"
+    t.string  "origin"
+    t.date    "date"
+    t.integer "booth_assignment_id"
+    t.integer "officer_assignment_id"
+    t.text    "amount_log",                default: ""
+    t.text    "officer_assignment_id_log", default: ""
+    t.text    "author_id_log",             default: ""
+  end
+
+  add_index "poll_null_results", ["booth_assignment_id"], name: "index_poll_null_results_on_booth_assignment_id", using: :btree
+  add_index "poll_null_results", ["officer_assignment_id"], name: "index_poll_null_results_on_officer_assignment_id", using: :btree
+
+  create_table "poll_officer_assignments", force: :cascade do |t|
+    t.integer  "booth_assignment_id"
+    t.integer  "officer_id"
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
+    t.date     "date",                                null: false
+    t.boolean  "final",               default: false
+    t.string   "user_data_log",       default: ""
+  end
+
+  add_index "poll_officer_assignments", ["booth_assignment_id"], name: "index_poll_officer_assignments_on_booth_assignment_id", using: :btree
+  add_index "poll_officer_assignments", ["officer_id", "date"], name: "index_poll_officer_assignments_on_officer_id_and_date", using: :btree
+  add_index "poll_officer_assignments", ["officer_id"], name: "index_poll_officer_assignments_on_officer_id", using: :btree
+
+  create_table "poll_officers", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "failed_census_calls_count", default: 0
+  end
+
+  add_index "poll_officers", ["user_id"], name: "index_poll_officers_on_user_id", using: :btree
+
+  create_table "poll_partial_results", force: :cascade do |t|
+    t.integer "question_id"
+    t.integer "author_id"
+    t.string  "answer"
+    t.integer "amount"
+    t.string  "origin"
+    t.date    "date"
+    t.integer "booth_assignment_id"
+    t.integer "officer_assignment_id"
+    t.text    "amount_log",                default: ""
+    t.text    "officer_assignment_id_log", default: ""
+    t.text    "author_id_log",             default: ""
+  end
+
+  add_index "poll_partial_results", ["answer"], name: "index_poll_partial_results_on_answer", using: :btree
+  add_index "poll_partial_results", ["author_id"], name: "index_poll_partial_results_on_author_id", using: :btree
+  add_index "poll_partial_results", ["booth_assignment_id", "date"], name: "index_poll_partial_results_on_booth_assignment_id_and_date", using: :btree
+  add_index "poll_partial_results", ["origin"], name: "index_poll_partial_results_on_origin", using: :btree
+  add_index "poll_partial_results", ["question_id"], name: "index_poll_partial_results_on_question_id", using: :btree
+
+  create_table "poll_questions", force: :cascade do |t|
+    t.integer  "proposal_id"
+    t.integer  "poll_id"
+    t.integer  "author_id"
+    t.string   "author_visible_name"
+    t.string   "title"
+    t.string   "valid_answers"
+    t.text     "description"
+    t.integer  "comments_count"
+    t.datetime "hidden_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.tsvector "tsv"
+  end
+
+  add_index "poll_questions", ["author_id"], name: "index_poll_questions_on_author_id", using: :btree
+  add_index "poll_questions", ["poll_id"], name: "index_poll_questions_on_poll_id", using: :btree
+  add_index "poll_questions", ["proposal_id"], name: "index_poll_questions_on_proposal_id", using: :btree
+  add_index "poll_questions", ["tsv"], name: "index_poll_questions_on_tsv", using: :gin
+
+  create_table "poll_recounts", force: :cascade do |t|
+    t.integer  "booth_assignment_id"
+    t.integer  "officer_assignment_id"
+    t.integer  "count"
+    t.text     "count_log",                 default: ""
+    t.datetime "created_at",                             null: false
+    t.datetime "updated_at",                             null: false
+    t.date     "date",                                   null: false
+    t.text     "officer_assignment_id_log", default: ""
+  end
+
+  add_index "poll_recounts", ["booth_assignment_id"], name: "index_poll_recounts_on_booth_assignment_id", using: :btree
+  add_index "poll_recounts", ["officer_assignment_id"], name: "index_poll_recounts_on_officer_assignment_id", using: :btree
+
+  create_table "poll_voters", force: :cascade do |t|
+    t.string   "document_number"
+    t.string   "document_type"
+    t.datetime "created_at",            null: false
+    t.datetime "updated_at",            null: false
+    t.integer  "poll_id",               null: false
+    t.integer  "booth_assignment_id"
+    t.integer  "age"
+    t.string   "gender"
+    t.integer  "geozone_id"
+    t.integer  "answer_id"
+    t.integer  "officer_assignment_id"
+    t.integer  "user_id"
+  end
+
+  add_index "poll_voters", ["booth_assignment_id"], name: "index_poll_voters_on_booth_assignment_id", using: :btree
+  add_index "poll_voters", ["document_number"], name: "index_poll_voters_on_document_number", using: :btree
+  add_index "poll_voters", ["officer_assignment_id"], name: "index_poll_voters_on_officer_assignment_id", using: :btree
+  add_index "poll_voters", ["poll_id", "document_number", "document_type"], name: "doc_by_poll", using: :btree
+  add_index "poll_voters", ["poll_id"], name: "index_poll_voters_on_poll_id", using: :btree
+  add_index "poll_voters", ["user_id"], name: "index_poll_voters_on_user_id", using: :btree
+
+  create_table "poll_white_results", force: :cascade do |t|
+    t.integer "author_id"
+    t.integer "amount"
+    t.string  "origin"
+    t.date    "date"
+    t.integer "booth_assignment_id"
+    t.integer "officer_assignment_id"
+    t.text    "amount_log",                default: ""
+    t.text    "officer_assignment_id_log", default: ""
+    t.text    "author_id_log",             default: ""
+  end
+
+  add_index "poll_white_results", ["booth_assignment_id"], name: "index_poll_white_results_on_booth_assignment_id", using: :btree
+  add_index "poll_white_results", ["officer_assignment_id"], name: "index_poll_white_results_on_officer_assignment_id", using: :btree
+
+  create_table "polls", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "starts_at"
+    t.datetime "ends_at"
+    t.boolean  "published",          default: false
+    t.boolean  "geozone_restricted", default: false
+  end
+
+  add_index "polls", ["starts_at", "ends_at"], name: "index_polls_on_starts_at_and_ends_at", using: :btree
+
   create_table "proposal_notifications", force: :cascade do |t|
     t.string   "title"
     t.text     "body"
@@ -612,8 +800,9 @@ ActiveRecord::Schema.define(version: 20170324101716) do
     t.boolean  "email_digest",                              default: true
     t.boolean  "email_on_direct_message",                   default: true
     t.boolean  "official_position_badge",                   default: false
-    t.datetime "password_changed_at",                       default: '2016-11-02 13:51:14', null: false
+    t.datetime "password_changed_at",                       default: '2016-11-23 10:59:20', null: false
     t.boolean  "created_from_signature",                    default: false
+    t.text     "former_users_data_log",                     default: ""
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
@@ -704,14 +893,36 @@ ActiveRecord::Schema.define(version: 20170324101716) do
   add_foreign_key "administrators", "users"
   add_foreign_key "annotations", "legislations"
   add_foreign_key "annotations", "users"
+  add_foreign_key "failed_census_calls", "poll_officers"
   add_foreign_key "failed_census_calls", "users"
   add_foreign_key "flags", "users"
+  add_foreign_key "geozones_polls", "geozones"
+  add_foreign_key "geozones_polls", "polls"
   add_foreign_key "identities", "users"
   add_foreign_key "locks", "users"
   add_foreign_key "managers", "users"
   add_foreign_key "moderators", "users"
   add_foreign_key "notifications", "users"
   add_foreign_key "organizations", "users"
+  add_foreign_key "poll_answers", "poll_questions", column: "question_id"
+  add_foreign_key "poll_booth_assignments", "polls"
+  add_foreign_key "poll_final_recounts", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_final_recounts", "poll_officer_assignments", column: "officer_assignment_id"
+  add_foreign_key "poll_null_results", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_null_results", "poll_officer_assignments", column: "officer_assignment_id"
+  add_foreign_key "poll_officer_assignments", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_partial_results", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_partial_results", "poll_officer_assignments", column: "officer_assignment_id"
+  add_foreign_key "poll_partial_results", "poll_questions", column: "question_id"
+  add_foreign_key "poll_partial_results", "users", column: "author_id"
+  add_foreign_key "poll_questions", "polls"
+  add_foreign_key "poll_questions", "proposals"
+  add_foreign_key "poll_questions", "users", column: "author_id"
+  add_foreign_key "poll_recounts", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_recounts", "poll_officer_assignments", column: "officer_assignment_id"
+  add_foreign_key "poll_voters", "polls"
+  add_foreign_key "poll_white_results", "poll_booth_assignments", column: "booth_assignment_id"
+  add_foreign_key "poll_white_results", "poll_officer_assignments", column: "officer_assignment_id"
   add_foreign_key "users", "geozones"
   add_foreign_key "valuators", "users"
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index bbbf0eb01..0f1a4f7a3 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -70,6 +70,7 @@ Setting["meta_keywords"] = nil
 # Feature flags
 Setting['feature.debates'] = true
 Setting['feature.spending_proposals'] = nil
+Setting['feature.polls'] = true
 Setting['feature.twitter_login'] = true
 Setting['feature.facebook_login'] = true
 Setting['feature.google_login'] = true
diff --git a/lib/age.rb b/lib/age.rb
new file mode 100644
index 000000000..c6ae6fe18
--- /dev/null
+++ b/lib/age.rb
@@ -0,0 +1,7 @@
+module Age
+  def self.in_years(dob, now = Time.now.utc.to_date)
+    return nil unless dob.present?
+    # reference: http://stackoverflow.com/questions/819263/get-persons-age-in-ruby#comment21200772_819263
+    now.year - dob.year - ((now.month > dob.month || (now.month == dob.month && now.day >= dob.day)) ? 0 : 1)
+  end
+end
diff --git a/lib/census_api.rb b/lib/census_api.rb
index 7f88557f2..eadfc549e 100644
--- a/lib/census_api.rb
+++ b/lib/census_api.rb
@@ -61,6 +61,10 @@ class CensusApi
       end
     end
 
+    def name
+      "#{data[:datos_habitante][:item][:nombre]} #{data[:datos_habitante][:item][:apellido1]}"
+    end
+
     private
 
       def data
diff --git a/spec/factories.rb b/spec/factories.rb
index 116b612d5..b295fd60c 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -22,6 +22,9 @@ FactoryGirl.define do
       sms_confirmation_code "1234"
       document_type "1"
       document_number
+      date_of_birth Date.new(1980, 12, 31)
+      gender "female"
+      geozone
     end
 
     trait :level_three do
@@ -37,6 +40,7 @@ FactoryGirl.define do
     trait :with_confirmed_hide do
       confirmed_hide_at Time.current
     end
+
   end
 
   factory :identity do
@@ -181,6 +185,10 @@ FactoryGirl.define do
         4.times { create(:vote, votable: debate) }
       end
     end
+
+    trait :successful do
+      cached_votes_up { Proposal.votes_needed_for_success + 100 }
+    end
   end
 
   factory :spending_proposal do
@@ -359,6 +367,127 @@ FactoryGirl.define do
     user
   end
 
+  factory :poll_officer, class: 'Poll::Officer' do
+    user
+  end
+
+  factory :poll do
+    sequence(:name) { |n| "Poll #{n}" }
+
+    starts_at { 1.month.ago }
+    ends_at { 1.month.from_now }
+
+    trait :incoming do
+      starts_at { 2.days.from_now }
+      ends_at { 1.month.from_now }
+    end
+
+    trait :expired do
+      starts_at { 1.month.ago }
+      ends_at { 15.days.ago }
+    end
+
+    trait :published do
+      published true
+    end
+  end
+
+  factory :poll_question, class: 'Poll::Question' do
+    poll
+    association :author, factory: :user
+    sequence(:title) { |n| "Question title #{n}" }
+    sequence(:description) { |n| "Question description #{n}" }
+    valid_answers { Faker::Lorem.words(3).join(', ') }
+  end
+
+  factory :poll_booth, class: 'Poll::Booth' do
+    sequence(:name) { |n| "Booth #{n}" }
+    sequence(:location) { |n| "Street #{n}" }
+  end
+
+  factory :poll_booth_assignment, class: 'Poll::BoothAssignment' do
+    poll
+    association :booth, factory: :poll_booth
+  end
+
+  factory :poll_officer_assignment, class: 'Poll::OfficerAssignment' do
+    association :officer, factory: :poll_officer
+    association :booth_assignment, factory: :poll_booth_assignment
+    date Time.current.to_date
+
+    trait :final do
+      final true
+    end
+  end
+
+  factory :poll_recount, class: 'Poll::Recount' do
+    association :officer_assignment, factory: :poll_officer_assignment
+    association :booth_assignment, factory: :poll_booth_assignment
+    count (1..100).to_a.sample
+    date (1.month.ago.to_datetime..1.month.from_now.to_datetime).to_a.sample
+  end
+
+  factory :poll_final_recount, class: 'Poll::FinalRecount' do
+    association :officer_assignment, factory: [:poll_officer_assignment, :final]
+    association :booth_assignment, factory: :poll_booth_assignment
+    count (1..100).to_a.sample
+    date (1.month.ago.to_datetime..1.month.from_now.to_datetime).to_a.sample
+  end
+
+  factory :poll_voter, class: 'Poll::Voter' do
+    poll
+    association :user, :level_two
+
+    trait :from_booth do
+      association :booth_assignment, factory: :poll_booth_assignment
+    end
+
+    trait :valid_document do
+      document_type   "1"
+      document_number "12345678Z"
+    end
+
+    trait :invalid_document do
+      document_type   "1"
+      document_number "99999999A"
+    end
+  end
+
+  factory :poll_answer, class: 'Poll::Answer' do
+    association :question, factory: :poll_question
+    association :author, factory: [:user, :level_two]
+    answer { question.valid_answers.sample }
+  end
+
+  factory :poll_partial_result, class: 'Poll::PartialResult' do
+    association :question, factory: :poll_question
+    association :author, factory: :user
+    origin { 'web' }
+    answer { question.valid_answers.sample }
+  end
+
+  factory :poll_white_result, class: 'Poll::WhiteResult' do
+    association :author, factory: :user
+    origin { 'web' }
+  end
+
+  factory :poll_null_result, class: 'Poll::NullResult' do
+    association :author, factory: :user
+    origin { 'web' }
+  end
+
+  factory :officing_residence, class: 'Officing::Residence' do
+    user
+    association :officer, factory: :poll_officer
+    document_number
+    document_type    "1"
+    year_of_birth    "1980"
+
+    trait :invalid do
+      year_of_birth Time.current.year
+    end
+  end
+
   factory :organization do
     user
     responsible_name "Johnny Utah"
@@ -415,6 +544,10 @@ FactoryGirl.define do
     sequence(:name) { |n| "District #{n}" }
     sequence(:external_code) { |n| "#{n}" }
     sequence(:census_code) { |n| "#{n}" }
+
+    trait :in_census do
+      census_code "01"
+    end
   end
 
   factory :banner do
diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb
index d1c547185..ef24226f1 100644
--- a/spec/features/account_spec.rb
+++ b/spec/features/account_spec.rb
@@ -112,8 +112,13 @@ feature 'Account' do
   end
 
   scenario 'Errors editing credentials' do
-    visit account_path
+    visit root_path
 
+    click_link 'My account'
+
+    expect(current_path).to eq(account_path)
+
+    expect(page).to have_link('Change my credentials')
     click_link 'Change my credentials'
     click_button 'Update'
 
diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb
index 72814b3c3..70d9f7621 100644
--- a/spec/features/admin/banners_spec.rb
+++ b/spec/features/admin/banners_spec.rb
@@ -114,6 +114,7 @@ feature 'Admin banners magement' do
     visit admin_root_path
 
     within('#side_menu') do
+      click_link "Banners"
       click_link "Manage banners"
     end
 
diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb
index 18b92eed5..d4500d2f9 100644
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -31,6 +31,7 @@ feature 'Admin feature flags' do
     visit admin_root_path
 
     within('#side_menu') do
+      expect(page).not_to have_link "Budgets"
       expect(page).not_to have_link "Spending proposals"
     end
 
@@ -45,6 +46,7 @@ feature 'Admin feature flags' do
     visit admin_root_path
 
     within('#side_menu') do
+      expect(page).not_to have_link "Budgets"
       expect(page).not_to have_link "Spending proposals"
     end
 
diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/features/admin/poll/booth_assigments_spec.rb
new file mode 100644
index 000000000..7a07eab82
--- /dev/null
+++ b/spec/features/admin/poll/booth_assigments_spec.rb
@@ -0,0 +1,181 @@
+require 'rails_helper'
+
+feature 'Admin booths assignments' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario 'Assign booth to poll', :js do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+
+    visit admin_poll_path(poll)
+    within('#poll-resources') do
+      click_link 'Booths (0)'
+    end
+
+    expect(page).to have_content 'There are no booths assigned to this poll.'
+
+    fill_in 'search-booths', with: booth.name
+    click_button 'Search'
+    expect(page).to have_content(booth.name)
+
+    within('#search-booths-results') do
+      click_link 'Assign booth'
+    end
+
+    expect(page).to have_content 'Booth assigned'
+
+    visit admin_poll_path(poll)
+    within('#poll-resources') do
+      click_link 'Booths (1)'
+    end
+
+    expect(page).to_not have_content 'There are no booths assigned to this poll.'
+    expect(page).to have_content booth.name
+  end
+
+  scenario 'Remove booth from poll', :js do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+    assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+
+    visit admin_poll_path(poll)
+    within('#poll-resources') do
+      click_link 'Booths (1)'
+    end
+
+    expect(page).to_not have_content 'There are no booths assigned to this poll.'
+    expect(page).to have_content booth.name
+
+    within("#poll_booth_assignment_#{assignment.id}") do
+      click_link 'Remove booth from poll'
+    end
+
+    expect(page).to have_content 'Booth not assigned anymore'
+
+    visit admin_poll_path(poll)
+    within('#poll-resources') do
+      click_link 'Booths (0)'
+    end
+
+    expect(page).to have_content 'There are no booths assigned to this poll.'
+    expect(page).to_not have_content booth.name
+  end
+
+  feature 'Show' do
+    scenario 'Lists all assigned poll oficers' do
+      poll = create(:poll)
+      booth = create(:poll_booth)
+      booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+      officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment)
+      officer = officer_assignment.officer
+
+      booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+      officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2)
+      officer_2 = officer_assignment_2.officer
+
+      visit admin_poll_path(poll)
+      click_link 'Booths (2)'
+
+      within('#assigned_booths_list') { click_link booth.name }
+
+      click_link 'Officers'
+      within('#officers_list') do
+        expect(page).to have_content officer.name
+        expect(page).to_not have_content officer_2.name
+      end
+    end
+
+    scenario 'Lists all recounts for the booth assignment' do
+      poll = create(:poll, starts_at: 2.weeks.ago, ends_at: 1.week.ago)
+      booth = create(:poll_booth)
+      booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+      officer_assignment_1 = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: poll.starts_at)
+      officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: poll.ends_at)
+      final_officer_assignment = create(:poll_officer_assignment, :final, booth_assignment: booth_assignment, date: poll.ends_at)
+
+      recount_1 = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment_1,
+                         date: officer_assignment_1.date,
+                         count: 33)
+      recount_2 = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment_2,
+                         date: officer_assignment_2.date,
+                         count: 78)
+      final_recount = create(:poll_final_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: final_officer_assignment,
+                         date: final_officer_assignment.date,
+                         count: 5678)
+
+      booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+      other_recount = create(:poll_recount, booth_assignment: booth_assignment_2, count: 100)
+
+      visit admin_poll_path(poll)
+      click_link 'Booths (2)'
+
+      within('#assigned_booths_list') { click_link booth.name }
+
+      click_link 'Recounts'
+      within('#recounts_list') do
+        expect(page).to_not have_content other_recount.count
+
+        within("#recounting_#{recount_1.date.strftime('%Y%m%d')}") do
+          expect(page).to have_content recount_1.count
+        end
+
+        within("#recounting_#{recount_2.date.strftime('%Y%m%d')}") do
+          expect(page).to have_content recount_2.count
+        end
+
+        within("#recounting_#{final_recount.date.strftime('%Y%m%d')}") do
+          expect(page).to have_content final_recount.count
+        end
+
+      end
+    end
+
+    scenario 'Marks recount values with count-errors' do
+      poll = create(:poll)
+      booth = create(:poll_booth)
+      booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+      today = Time.current.to_date
+      officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, date: today)
+
+      recount = create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         officer_assignment: officer_assignment,
+                         date: officer_assignment.date,
+                         count: 1)
+
+      visit admin_poll_booth_assignment_path(poll, booth_assignment)
+      click_link 'Recounts'
+
+      within('#recounts_list') do
+        expect(page).to have_css("#recounting_#{recount.date.strftime('%Y%m%d')} td.count-error")
+        within("#recounting_#{recount.date.strftime('%Y%m%d')}") do
+          expect(page).to have_content recount.count
+          expect(page).to have_content 0
+        end
+      end
+
+      create(:poll_voter, :valid_document, poll: poll, booth_assignment: booth_assignment)
+
+      visit admin_poll_booth_assignment_path(poll, booth_assignment)
+      click_link 'Recounts'
+
+      within('#recounts_list') do
+        expect(page).to_not have_css('.count-error')
+        within("#recounting_#{recount.date.strftime('%Y%m%d')}") do
+          expect(page).to have_content(recount.count)
+        end
+      end
+    end
+
+  end
+end
diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/features/admin/poll/booths_spec.rb
new file mode 100644
index 000000000..ec8c10d58
--- /dev/null
+++ b/spec/features/admin/poll/booths_spec.rb
@@ -0,0 +1,86 @@
+require 'rails_helper'
+
+feature 'Admin booths' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario 'Index empty' do
+    visit admin_root_path
+
+    within('#side_menu') do
+      click_link "Booths location"
+    end
+
+    expect(page).to have_content "There are no booths"
+  end
+
+  scenario 'Index' do
+    3.times { create(:poll_booth) }
+
+    visit admin_root_path
+
+    within('#side_menu') do
+      click_link "Booths location"
+    end
+
+    booths = Poll::Booth.all
+    booths.each do |booth|
+      within("#booth_#{booth.id}") do
+        expect(page).to have_content booth.name
+        expect(page).to have_content booth.location
+      end
+    end
+    expect(page).to_not have_content "There are no booths"
+  end
+
+  scenario 'Show' do
+    booth = create(:poll_booth)
+
+    visit admin_booths_path
+
+    expect(page).to have_content booth.name
+    expect(page).to have_content booth.location
+  end
+
+  scenario "Create" do
+    visit admin_booths_path
+    click_link "Add booth"
+
+    fill_in "poll_booth_name", with: "Upcoming booth"
+    fill_in "poll_booth_location", with: "39th Street, number 2, ground floor"
+    click_button "Create booth"
+
+    expect(page).to have_content "Booth created successfully"
+
+    visit admin_booths_path
+    expect(page).to have_content "Upcoming booth"
+    expect(page).to have_content "39th Street, number 2, ground floor"
+  end
+
+  scenario "Edit" do
+    booth = create(:poll_booth)
+
+    visit admin_booths_path
+
+    within("#booth_#{booth.id}") do
+      click_link "Edit"
+    end
+
+    fill_in "poll_booth_name", with: "Next booth"
+    fill_in "poll_booth_location", with: "40th Street, number 1, firts floor"
+    click_button "Update booth"
+
+    expect(page).to have_content "Booth updated successfully"
+
+    visit admin_booths_path
+
+    within("#booth_#{booth.id}") do
+      expect(page).to have_content "Next booth"
+      expect(page).to have_content "40th Street, number 1, firts floor"
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb
new file mode 100644
index 000000000..6cbe43d14
--- /dev/null
+++ b/spec/features/admin/poll/officer_assignments_spec.rb
@@ -0,0 +1,97 @@
+require 'rails_helper'
+
+feature 'Admin officer assignments in poll' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario 'Assign officer to poll', :js do
+    booth_assignment = create(:poll_booth_assignment)
+    officer = create(:poll_officer)
+
+    visit admin_poll_path(booth_assignment.poll)
+    within('#poll-resources') do
+      click_link 'Officers (0)'
+    end
+
+    expect(page).to have_content 'There are no officers assigned to this poll'
+
+    fill_in 'search-officers', with: officer.name
+    click_button 'Search'
+
+    within('#search-officers-results') do
+      click_link 'Add shifts as officer'
+    end
+
+    expect(page).to have_content 'This user has no officing shifts in this poll'
+    expect(page).to have_content officer.name
+    expect(page).to have_content booth_assignment.poll.name
+
+    within('#officer_assignment_form') do
+      select I18n.l(booth_assignment.poll.ends_at.to_date, format: :long), from: 'date'
+      select "#{booth_assignment.booth.name} (#{booth_assignment.booth.location})", from: 'booth_id'
+      click_button 'Add shift'
+    end
+
+    expect(page).to have_content 'Officing shift added'
+    expect(page).to_not have_content 'This user has no officing shifts in this poll'
+
+    visit admin_poll_path(booth_assignment.poll)
+    within('#poll-resources') do
+      click_link 'Officers (1)'
+    end
+
+    expect(page).to_not have_content 'There are no officers in this poll'
+    expect(page).to have_content officer.name
+    expect(page).to have_content officer.email
+  end
+
+  scenario 'Remove officer assignment from poll' do
+    officer_assignment = create(:poll_officer_assignment)
+    poll = officer_assignment.booth_assignment.poll
+    booth = officer_assignment.booth_assignment.booth
+    officer = officer_assignment.officer
+
+    visit by_officer_admin_poll_officer_assignments_path(poll, officer_id: officer.id)
+
+    expect(page).to_not have_content 'This user has no officing shifts in this poll'
+    within("#poll_officer_assignment_#{officer_assignment.id}") do
+      expect(page).to have_content booth.name
+      click_link 'Remove'
+    end
+
+    expect(page).to have_content 'Officing shift removed'
+    expect(page).to have_content 'This user has no officing shifts in this poll'
+  end
+
+  scenario 'Index view shows recounts info for officer' do
+    booth_assignment = create(:poll_booth_assignment)
+    poll = booth_assignment.poll
+    officer = create(:poll_officer)
+    officer_assignment = create(:poll_officer_assignment,
+                                booth_assignment: booth_assignment,
+                                officer: officer,
+                                date: poll.starts_at)
+    final_officer_assignment = create(:poll_officer_assignment, :final,
+                                       booth_assignment: booth_assignment,
+                                       officer: officer,
+                                       date: poll.ends_at + 1.day)
+    recount = create(:poll_recount,
+                     booth_assignment: booth_assignment,
+                     officer_assignment: officer_assignment,
+                     date: officer_assignment.date,
+                     count: 77)
+    final_recount = create(:poll_final_recount,
+                           booth_assignment: booth_assignment,
+                           officer_assignment: final_officer_assignment,
+                           date: poll.ends_at,
+                           count: 9876)
+
+    visit by_officer_admin_poll_officer_assignments_path(poll, officer_id: officer.id)
+
+    within('#recount_list') { expect(page).to have_content('77') }
+    within('#final_recount_list') { expect(page).to have_content('9876') }
+  end
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/officers_spec.rb b/spec/features/admin/poll/officers_spec.rb
new file mode 100644
index 000000000..d9ea89638
--- /dev/null
+++ b/spec/features/admin/poll/officers_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+feature 'Admin poll officers' do
+
+  background do
+    @admin = create(:administrator)
+    @user  = create(:user, username: 'Pedro Jose Garcia')
+    @officer = create(:poll_officer)
+    login_as(@admin.user)
+    visit admin_officers_path
+  end
+
+  scenario 'Index' do
+    expect(page).to have_content @officer.name
+    expect(page).to have_content @officer.email
+    expect(page).to_not have_content @user.name
+  end
+
+  scenario 'Create', :js do
+    fill_in 'email', with: @user.email
+    click_button 'Search'
+
+    expect(page).to have_content @user.name
+    click_link 'Add'
+    within("#officers") do
+      expect(page).to have_content @user.name
+    end
+  end
+
+  scenario 'Delete' do
+    click_link 'Delete position'
+
+    expect(page).to_not have_css '#officers'
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/features/admin/poll/polls_spec.rb
new file mode 100644
index 000000000..cb5a34265
--- /dev/null
+++ b/spec/features/admin/poll/polls_spec.rb
@@ -0,0 +1,366 @@
+require 'rails_helper'
+
+feature 'Admin polls' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario 'Index empty', :js do
+    visit admin_root_path
+
+    click_link "Polls"
+    within('#polls_menu') do
+      click_link "Polls"
+    end
+
+    expect(page).to have_content "There are no polls"
+  end
+
+  scenario 'Index', :js do
+    3.times { create(:poll) }
+
+    visit admin_root_path
+
+    click_link "Polls"
+    within('#polls_menu') do
+      click_link "Polls"
+    end
+
+    expect(page).to have_css ".poll", count: 3
+
+    polls = Poll.all
+    polls.each do |poll|
+      within("#poll_#{poll.id}") do
+        expect(page).to have_content poll.name
+      end
+    end
+    expect(page).to_not have_content "There are no polls"
+  end
+
+  scenario 'Show' do
+    poll = create(:poll)
+
+    visit admin_polls_path
+    click_link poll.name
+
+    expect(page).to have_content poll.name
+  end
+
+  scenario "Create" do
+    visit admin_polls_path
+    click_link "Create poll"
+
+    start_date = 1.week.from_now
+    end_date = 2.weeks.from_now
+
+    fill_in "poll_name", with: "Upcoming poll"
+    fill_in 'poll_starts_at', with: start_date.strftime("%d/%m/%Y")
+    fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y")
+    click_button "Create poll"
+
+    expect(page).to have_content "Poll created successfully"
+    expect(page).to have_content "Upcoming poll"
+    expect(page).to have_content I18n.l(start_date.to_date)
+    expect(page).to have_content I18n.l(end_date.to_date)
+  end
+
+  scenario "Edit" do
+    poll = create(:poll)
+
+    visit admin_poll_path(poll)
+    click_link "Edit"
+
+    end_date = 1.year.from_now
+
+    fill_in "poll_name", with: "Next Poll"
+    fill_in 'poll_ends_at', with: end_date.strftime("%d/%m/%Y")
+    click_button "Update poll"
+
+    expect(page).to have_content "Poll updated successfully"
+    expect(page).to have_content "Next Poll"
+    expect(page).to have_content I18n.l(end_date.to_date)
+  end
+
+  scenario 'Edit from index' do
+    poll = create(:poll)
+    visit admin_polls_path
+
+    within("#poll_#{poll.id}") do
+      click_link "Edit"
+    end
+
+    expect(current_path).to eq(edit_admin_poll_path(poll))
+  end
+
+  context "Booths" do
+
+    context "Poll show" do
+
+      scenario "No booths" do
+        poll = create(:poll)
+        visit admin_poll_path(poll)
+        click_link "Booths (0)"
+
+        expect(page).to have_content "There are no booths assigned to this poll."
+      end
+
+      scenario "Booth list" do
+        poll = create(:poll)
+        3.times { create(:poll_booth, polls: [poll]) }
+
+        visit admin_poll_path(poll)
+        click_link "Booths (3)"
+
+        expect(page).to have_css ".booth", count: 3
+
+        poll.booth_assignments.each do |ba|
+          within("#poll_booth_assignment_#{ba.id}") do
+            expect(page).to have_content ba.booth.name
+            expect(page).to have_content ba.booth.location
+          end
+        end
+        expect(page).to_not have_content "There are no booths assigned to this poll."
+      end
+    end
+  end
+
+  context "Officers" do
+
+    context "Poll show" do
+
+      scenario "No officers", :js do
+        poll = create(:poll)
+        visit admin_poll_path(poll)
+        click_link "Officers (0)"
+
+        expect(page).to have_content "There are no officers assigned to this poll"
+      end
+
+      scenario "Officer list", :js do
+        poll = create(:poll)
+        booth = create(:poll_booth, polls: [poll])
+
+        booth.booth_assignments.each do |booth_assignment|
+          3.times {create(:poll_officer_assignment, booth_assignment: booth_assignment) }
+        end
+
+        visit admin_poll_path(poll)
+
+        click_link "Officers (3)"
+
+        expect(page).to have_css ".officer", count: 3
+
+        officers = Poll::Officer.all
+        officers.each do |officer|
+          within("#officer_#{officer.id}") do
+            expect(page).to have_content officer.name
+            expect(page).to have_content officer.email
+          end
+        end
+        expect(page).to_not have_content "There are no officers assigned to this poll"
+      end
+    end
+  end
+
+  context "Questions" do
+
+    context "Poll show" do
+
+      scenario "Question list", :js do
+        poll = create(:poll)
+        question = create(:poll_question, poll: poll)
+        other_question = create(:poll_question)
+
+        visit admin_poll_path(poll)
+
+        expect(page).to have_content "Questions (1)"
+        expect(page).to have_content question.title
+        expect(page).to_not have_content other_question.title
+        expect(page).to_not have_content "There are no questions assigned to this poll"
+      end
+
+      scenario 'Add question to poll', :js do
+        poll = create(:poll)
+        question = create(:poll_question, poll: nil, title: 'Should we rebuild the city?')
+
+        visit admin_poll_path(poll)
+
+        expect(page).to have_content 'Questions (0)'
+        expect(page).to have_content 'There are no questions assigned to this poll'
+
+        fill_in 'search-questions', with: 'rebuild'
+        click_button 'Search'
+
+        within('#search-questions-results') do
+          click_link 'Include question'
+        end
+
+        expect(page).to have_content 'Question added to this poll'
+
+        visit admin_poll_path(poll)
+
+        expect(page).to have_content 'Questions (1)'
+        expect(page).to_not have_content 'There are no questions assigned to this poll'
+        expect(page).to have_content question.title
+      end
+
+      scenario 'Remove question from poll', :js do
+        poll = create(:poll)
+        question = create(:poll_question, poll: poll)
+
+        visit admin_poll_path(poll)
+
+        expect(page).to have_content 'Questions (1)'
+        expect(page).to_not have_content 'There are no questions assigned to this poll'
+        expect(page).to have_content question.title
+
+        within("#poll_question_#{question.id}") do
+          click_link 'Remove question from poll'
+        end
+
+        expect(page).to have_content 'Question removed from this poll'
+
+        visit admin_poll_path(poll)
+
+        expect(page).to have_content 'Questions (0)'
+        expect(page).to have_content 'There are no questions assigned to this poll'
+        expect(page).to_not have_content question.title
+      end
+
+    end
+  end
+
+  context "Recounting" do
+    context "Poll show" do
+      scenario "No recounts", :js do
+        poll = create(:poll)
+        visit admin_poll_path(poll)
+        click_link "Recounting"
+
+        expect(page).to have_content "There is nothing to be recounted"
+      end
+
+      scenario "Recounts list", :js do
+        poll = create(:poll)
+        booth_assignment = create(:poll_booth_assignment, poll: poll)
+        booth_assignment_recounted = create(:poll_booth_assignment, poll: poll)
+        booth_assignment_final_recounted = create(:poll_booth_assignment, poll: poll)
+
+        3.times { |i| create(:poll_recount,
+                         booth_assignment: booth_assignment,
+                         date: poll.starts_at + i.days,
+                         count: 33) }
+
+        3.times { |i| create(:poll_final_recount,
+                         booth_assignment: booth_assignment,
+                         date: poll.starts_at + i.days,
+                         count: 21) }
+
+        2.times { create(:poll_voter,
+                  booth_assignment: booth_assignment_final_recounted) }
+
+        create(:poll_recount,
+               booth_assignment: booth_assignment_recounted,
+               date: poll.ends_at,
+               count: 777)
+
+        create(:poll_final_recount,
+               booth_assignment: booth_assignment_final_recounted,
+               date: poll.ends_at,
+               count: 55555)
+
+        visit admin_poll_path(poll)
+
+        click_link "Recounting"
+
+        expect(page).to have_css ".booth_recounts", count: 3
+
+        within("#poll_booth_assignment_#{booth_assignment.id}_recounts") do
+          expect(page).to have_content(booth_assignment.booth.name)
+          expect(page).to have_content('99')
+          expect(page).to have_content('63')
+        end
+
+        within("#poll_booth_assignment_#{booth_assignment_recounted.id}_recounts") do
+          expect(page).to have_content(booth_assignment_recounted.booth.name)
+          expect(page).to have_content('777')
+          expect(page).to have_content('-')
+        end
+
+        within("#poll_booth_assignment_#{booth_assignment_final_recounted.id}_recounts") do
+          expect(page).to have_content(booth_assignment_final_recounted.booth.name)
+          expect(page).to have_content('-')
+          expect(page).to have_content('55555')
+          expect(page).to have_content('2')
+        end
+      end
+    end
+  end
+
+  context "Results" do
+    context "Poll show" do
+      scenario "No results", :js do
+        poll = create(:poll)
+        visit admin_poll_path(poll)
+        click_link "Results"
+
+        expect(page).to have_content "There are no results"
+      end
+
+      scenario "Results by answer", :js do
+        poll = create(:poll)
+        booth_assignment_1 = create(:poll_booth_assignment, poll: poll)
+        booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+        booth_assignment_3 = create(:poll_booth_assignment, poll: poll)
+
+        question_1 = create(:poll_question, poll: poll, valid_answers: "Yes,No")
+        question_2 = create(:poll_question, poll: poll, valid_answers: "Today,Tomorrow")
+
+        [booth_assignment_1, booth_assignment_2, booth_assignment_3].each do |ba|
+          create(:poll_partial_result,
+                  booth_assignment: ba,
+                  question: question_1,
+                  answer: 'Yes',
+                  amount: 11)
+          create(:poll_partial_result,
+                  booth_assignment: ba,
+                  question: question_2,
+                  answer: 'Tomorrow',
+                  amount: 5)
+        end
+        create(:poll_white_result,
+               booth_assignment: booth_assignment_1,
+               amount: 21)
+        create(:poll_null_result,
+               booth_assignment: booth_assignment_3,
+               amount: 44)
+
+        visit admin_poll_path(poll)
+
+        click_link "Results"
+
+        expect(page).to have_content(question_1.title)
+        question_1.valid_answers.each_with_index do |answer, i|
+          within("#question_#{question_1.id}_#{i}_result") do
+            expect(page).to have_content(answer)
+            expect(page).to have_content([33, 0][i])
+          end
+        end
+
+        expect(page).to have_content(question_2.title)
+        question_2.valid_answers.each_with_index do |answer, i|
+          within("#question_#{question_2.id}_#{i}_result") do
+            expect(page).to have_content(answer)
+            expect(page).to have_content([0,15][i])
+          end
+        end
+
+        within('#white_results') { expect(page).to have_content('21') }
+        within('#null_results') { expect(page).to have_content('44') }
+      end
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/features/admin/poll/questions_spec.rb
new file mode 100644
index 000000000..2a1e100f0
--- /dev/null
+++ b/spec/features/admin/poll/questions_spec.rb
@@ -0,0 +1,116 @@
+require 'rails_helper'
+
+feature 'Admin poll questions' do
+
+  background do
+    login_as(create(:administrator).user)
+  end
+
+  scenario 'Index' do
+    question1 = create(:poll_question)
+    question2 = create(:poll_question)
+
+    visit admin_questions_path
+
+    expect(page).to have_content(question1.title)
+    expect(page).to have_content(question2.title)
+  end
+
+  scenario 'Show' do
+    geozone = create(:geozone)
+    poll = create(:poll, geozone_restricted: true, geozone_ids: [geozone.id])
+    question = create(:poll_question, poll: poll)
+
+    visit admin_question_path(question)
+
+    expect(page).to have_content(question.title)
+    expect(page).to have_content(question.description)
+    expect(page).to have_content(question.author.name)
+    expect(page).to have_content(question.valid_answers.join(" "))
+  end
+
+  scenario 'Create' do
+    poll = create(:poll, name: 'Movies')
+    title = "Star Wars: Episode IV - A New Hope"
+    description = %{
+      During the battle, Rebel spies managed to steal secret plans to the Empire's ultimate weapon, the DEATH STAR, an armored space station with enough power to destroy an entire planet.
+      Pursued by the Empire's sinister agents, Princess Leia races home aboard her starship, custodian of the stolen plans that can save her people and restore freedom to the galaxy....
+    }
+
+    visit admin_questions_path
+    click_link "Create question"
+
+    select 'Movies', from: 'poll_question_poll_id'
+    fill_in 'poll_question_title', with: title
+    fill_in 'poll_question_description', with: description
+
+    click_button 'Save'
+
+    expect(page).to have_content(title)
+    expect(page).to have_content(description)
+  end
+
+  scenario 'Create from successful proposal index' do
+    poll = create(:poll, name: 'Proposals')
+    proposal = create(:proposal, :successful)
+
+    visit proposals_path
+    click_link "Create question"
+
+    expect(current_path).to eq(new_admin_question_path)
+    expect(page).to have_field('poll_question_title', with: proposal.title)
+    expect(page).to have_field('poll_question_description', with: proposal.description)
+    expect(page).to have_field('poll_question_valid_answers', with: "Yes, No")
+
+    select 'Proposals', from: 'poll_question_poll_id'
+
+    click_button 'Save'
+
+    expect(page).to have_content(proposal.title)
+    expect(page).to have_content(proposal.description)
+    expect(page).to have_link(proposal.title, href: proposal_path(proposal))
+    expect(page).to have_link(proposal.author.name, href: user_path(proposal.author))
+  end
+
+  pending "Create from successul proposal show"
+
+  scenario 'Update' do
+    question1 = create(:poll_question)
+
+    visit admin_questions_path
+    within("#poll_question_#{question1.id}") do
+      click_link "Edit"
+    end
+
+    old_title = question1.title
+    new_title = "Potatoes are great and everyone should have one"
+    fill_in 'poll_question_title', with: new_title
+
+    click_button 'Save'
+
+    expect(page).to have_content "Changes saved"
+    expect(page).to have_content new_title
+
+    visit admin_questions_path
+
+    expect(page).to have_content(new_title)
+    expect(page).to_not have_content(old_title)
+  end
+
+  scenario 'Destroy' do
+    question1 = create(:poll_question)
+    question2 = create(:poll_question)
+
+    visit admin_questions_path
+
+    within("#poll_question_#{question1.id}") do
+      click_link "Delete"
+    end
+
+    expect(page).to_not have_content(question1.title)
+    expect(page).to have_content(question2.title)
+  end
+
+  pending "Mark all city by default when creating a poll question from a successful proposal"
+
+end
diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb
index 5539b5ead..953cdc4f6 100644
--- a/spec/features/admin/spending_proposals_spec.rb
+++ b/spec/features/admin/spending_proposals_spec.rb
@@ -93,11 +93,11 @@ feature 'Admin spending proposals' do
       expect(page).to have_button("Update")
       click_link("Back")
       expect(page).to_not have_button("Update")
+      expect(page).to have_link("Back")
       click_link("Back")
 
       expect(page).to_not have_link("Destroy the city")
       expect(page).to have_link("Realocate visitors")
-
     end
 
     scenario "Filtering by admin", :js do
@@ -135,8 +135,10 @@ feature 'Admin spending proposals' do
       click_link("Realocate visitors")
       click_link("Edit classification")
       expect(page).to have_button("Update")
+      expect(page).to have_link("Back")
       click_link("Back")
       expect(page).to_not have_button("Update")
+      expect(page).to have_link("Back")
       click_link("Back")
 
       expect(page).to have_content('There is 1 spending proposal')
@@ -182,8 +184,10 @@ feature 'Admin spending proposals' do
       click_link("Realocate visitors")
       click_link("Edit classification")
       expect(page).to have_button("Update")
+      expect(page).to have_link("Back")
       click_link("Back")
       expect(page).to_not have_button("Update")
+      expect(page).to have_link("Back")
       click_link("Back")
 
       expect(page).to have_content('There is 1 spending proposal')
diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb
index 161b01999..064021ab8 100644
--- a/spec/features/admin_spec.rb
+++ b/spec/features/admin_spec.rb
@@ -16,7 +16,7 @@ feature 'Admin' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
-  scenario 'Access as a moderator is not authorized' do
+  scenario 'Access as moderator is not authorized' do
     create(:moderator, user: user)
     login_as(user)
     visit admin_root_path
@@ -26,7 +26,7 @@ feature 'Admin' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
-  scenario 'Access as a valuator is not authorized' do
+  scenario 'Access as valuator is not authorized' do
     create(:valuator, user: user)
     login_as(user)
     visit admin_root_path
@@ -36,7 +36,7 @@ feature 'Admin' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
-  scenario 'Access as a manager is not authorized' do
+  scenario 'Access as manager is not authorized' do
     create(:manager, user: user)
     login_as(user)
     visit admin_root_path
@@ -46,7 +46,17 @@ feature 'Admin' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
-  scenario 'Access as an administrator is authorized' do
+  scenario 'Access as poll officer is not authorized' do
+    create(:poll_officer, user: user)
+    login_as(user)
+    visit admin_root_path
+
+    expect(current_path).not_to eq(admin_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as administrator is authorized' do
     login_as(administrator)
     visit admin_root_path
 
diff --git a/spec/features/comments/poll_questions_spec.rb b/spec/features/comments/poll_questions_spec.rb
new file mode 100644
index 000000000..6e5cffe97
--- /dev/null
+++ b/spec/features/comments/poll_questions_spec.rb
@@ -0,0 +1 @@
+#refactor specs and test as one more commmentable
\ No newline at end of file
diff --git a/spec/features/home_spec.rb b/spec/features/home_spec.rb
index 708b1c883..4deed36bb 100644
--- a/spec/features/home_spec.rb
+++ b/spec/features/home_spec.rb
@@ -43,7 +43,7 @@ feature "Home" do
     end
 
     def ie_alert_box_xpath
-      "/html/body/div[@class='wrapper']/comment()[contains(.,'ie-callout')]"
+      "/html/body/div[@class='wrapper ']/comment()[contains(.,'ie-callout')]"
     end
   end
 end
diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb
index dc3604c3a..65d2481ba 100644
--- a/spec/features/moderation/comments_spec.rb
+++ b/spec/features/moderation/comments_spec.rb
@@ -84,6 +84,8 @@ feature 'Moderate comments' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:comment, 2)
 
         visit moderation_comments_path
diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb
index 78aca9b7e..8a729efe7 100644
--- a/spec/features/moderation/debates_spec.rb
+++ b/spec/features/moderation/debates_spec.rb
@@ -91,6 +91,8 @@ feature 'Moderate debates' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:debate, 2)
 
         visit moderation_debates_path
diff --git a/spec/features/moderation/proposals_spec.rb b/spec/features/moderation/proposals_spec.rb
index ab8da4764..6acff7c71 100644
--- a/spec/features/moderation/proposals_spec.rb
+++ b/spec/features/moderation/proposals_spec.rb
@@ -83,6 +83,8 @@ feature 'Moderate proposals' do
       end
 
       scenario "select all/none", :js do
+        Capybara.current_driver = :poltergeist_no_js_errors
+
         create_list(:proposal, 2)
 
         visit moderation_proposals_path
diff --git a/spec/features/moderation_spec.rb b/spec/features/moderation_spec.rb
index 6607ec48a..fedcb105d 100644
--- a/spec/features/moderation_spec.rb
+++ b/spec/features/moderation_spec.rb
@@ -43,6 +43,20 @@ feature 'Moderation' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
+  scenario 'Access as poll officer is not authorized' do
+    create(:poll_officer, user: user)
+
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Moderation")
+    visit moderation_root_path
+
+    expect(current_path).not_to eq(moderation_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
   scenario 'Access as a moderator is authorized' do
     create(:moderator, user: user)
 
diff --git a/spec/features/officing/final_recount_spec.rb b/spec/features/officing/final_recount_spec.rb
new file mode 100644
index 000000000..1fcfa48a1
--- /dev/null
+++ b/spec/features/officing/final_recount_spec.rb
@@ -0,0 +1,147 @@
+require 'rails_helper'
+
+feature 'Officing Final Recount' do
+
+  background do
+    @poll_officer = create(:poll_officer)
+    @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer)
+    @poll = @officer_assignment.booth_assignment.poll
+    @poll.update(ends_at: 1.day.ago)
+    login_as(@poll_officer.user)
+  end
+
+  scenario 'Only polls where user is officer for final recounts are accessible' do
+    regular_officer_assignment_1 = create(:poll_officer_assignment, officer: @poll_officer)
+    regular_officer_assignment_2 = create(:poll_officer_assignment, officer: @poll_officer)
+
+    not_allowed_poll_1 = create(:poll, :expired)
+    not_allowed_poll_2 = regular_officer_assignment_1.booth_assignment.poll
+    not_allowed_poll_2.update(ends_at: 1.day.ago)
+    not_allowed_poll_3 = regular_officer_assignment_2.booth_assignment.poll
+
+    visit root_path
+    click_link 'Polling officers'
+
+    expect(page).to have_content('Poll officing')
+    within('#side_menu') do
+      click_link 'Final recounts and results'
+    end
+
+    expect(page).to_not have_content(not_allowed_poll_1.name)
+    expect(page).to_not have_content(not_allowed_poll_2.name)
+    expect(page).to_not have_content(not_allowed_poll_3.name)
+    expect(page).to have_content(@poll.name)
+
+    visit new_officing_poll_final_recount_path(not_allowed_poll_1)
+    expect(page).to have_content('You are allowed to add final recounts for this poll')
+  end
+
+  scenario 'Add final recount' do
+    visit officing_root_path
+
+    within('#side_menu') do
+      click_link 'Final recounts and results'
+    end
+
+    within("#poll_#{@poll.id}") do
+      expect(page).to have_content(@poll.name)
+      click_link 'Add final recount'
+    end
+
+    expect(page).to_not have_content('Your recounts')
+
+    booth_name = @officer_assignment.booth_assignment.booth.name
+    date = I18n.l(@poll.starts_at.to_date, format: :long)
+    select booth_name, from: 'officer_assignment_id'
+    select date, from: 'date'
+    fill_in :count, with: '33'
+    click_button 'Save'
+
+    expect(page).to have_content('Your final recounts')
+
+    within("#poll_final_recount_#{@officer_assignment.booth_assignment.final_recounts.first.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('33')
+    end
+  end
+
+  scenario 'Edit final recount' do
+    final_recount = create(:poll_final_recount,
+                    officer_assignment: @officer_assignment,
+                    booth_assignment: @officer_assignment.booth_assignment,
+                    date: @poll.starts_at,
+                    count: 100)
+
+    booth_name = @officer_assignment.booth_assignment.booth.name
+    date = I18n.l(final_recount.date.to_date, format: :long)
+
+    visit new_officing_poll_final_recount_path(@poll)
+
+    expect(page).to have_content('Your final recounts')
+
+    within("#poll_final_recount_#{final_recount.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('100')
+    end
+
+    select booth_name, from: 'officer_assignment_id'
+    select date, from: 'date'
+    fill_in :count, with: '42'
+    click_button 'Save'
+
+    expect(page).to have_content "Data added"
+
+    within("#poll_final_recount_#{final_recount.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('42')
+    end
+    expect(page).to_not have_content('100')
+  end
+
+  scenario 'Show final and system recounts to compare' do
+    final_officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer)
+    poll = final_officer_assignment.booth_assignment.poll
+    poll.update(ends_at: 1.day.ago)
+    final_recount = create(:poll_final_recount,
+                    officer_assignment: final_officer_assignment,
+                    booth_assignment: final_officer_assignment.booth_assignment,
+                    date: 7.days.ago,
+                    count: 100)
+    33.times { create(:poll_voter, :valid_document,
+                      poll: poll,
+                      booth_assignment: final_officer_assignment.booth_assignment,
+                      created_at: final_recount.date) }
+
+    visit new_officing_poll_final_recount_path(poll)
+    within("#poll_final_recount_#{final_recount.id}") do
+      expect(page).to have_content(I18n.l(final_recount.date.to_date, format: :long))
+      expect(page).to have_content(final_officer_assignment.booth_assignment.booth.name)
+      expect(page).to have_content('100')
+      expect(page).to have_content('33')
+    end
+  end
+
+  scenario "Show link to add results for same booth/date" do
+    final_officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer)
+    poll = final_officer_assignment.booth_assignment.poll
+    poll.update(ends_at: 1.day.ago)
+    final_recount = create(:poll_final_recount,
+                    officer_assignment: final_officer_assignment,
+                    booth_assignment: final_officer_assignment.booth_assignment,
+                    date: 7.days.ago,
+                    count: 100)
+    visit new_officing_poll_final_recount_path(poll)
+    within("#poll_final_recount_#{final_recount.id}") do
+      click_link "Add results"
+    end
+
+    expected_path = new_officing_poll_result_path(poll, oa: final_recount.officer_assignment.id, d: I18n.l(final_recount.date.to_date))
+    expect(page).to have_current_path(expected_path)
+    expect(page).to have_select('officer_assignment_id', selected: final_recount.booth_assignment.booth.name)
+    expect(page).to have_select('date', selected: I18n.l(final_recount.date.to_date, format: :long))
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/officing/recount_spec.rb b/spec/features/officing/recount_spec.rb
new file mode 100644
index 000000000..a7d74d0be
--- /dev/null
+++ b/spec/features/officing/recount_spec.rb
@@ -0,0 +1,87 @@
+require 'rails_helper'
+
+feature 'Officing Recount' do
+
+  background do
+    @poll_officer = create(:poll_officer)
+    @officer_assignment = create(:poll_officer_assignment, officer: @poll_officer)
+    @poll = @officer_assignment.booth_assignment.poll
+    login_as(@poll_officer.user)
+  end
+
+  scenario 'Only polls where user is officer are accessible' do
+    not_allowed_poll = create(:poll)
+
+    visit root_path
+    click_link 'Polling officers'
+
+    expect(page).to have_content('Poll officing')
+    within('#side_menu') do
+      click_link 'Store recount'
+    end
+
+    expect(page).to_not have_content(not_allowed_poll.name)
+    expect(page).to have_content(@poll.name)
+
+    visit new_officing_poll_recount_path(not_allowed_poll)
+    expect(page).to have_content('You are not a poll officer for this poll')
+  end
+
+  scenario 'Add recount' do
+    visit officing_root_path
+
+    within('#side_menu') do
+      click_link 'Store recount'
+    end
+
+    click_link @poll.name
+
+    expect(page).to_not have_content('Your recounts')
+
+    booth_name = @officer_assignment.booth_assignment.booth.name
+    date = I18n.l(@officer_assignment.date.to_date, format: :long)
+    select "#{booth_name}: #{date}", from: 'officer_assignment_id'
+    fill_in :count, with: '33'
+    click_button 'Save'
+
+    expect(page).to have_content('Your recounts')
+
+    within("#poll_recount_#{@officer_assignment.booth_assignment.recounts.first.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('33')
+    end
+  end
+
+  scenario 'Edit recount' do
+    recount = create(:poll_recount,
+                    officer_assignment: @officer_assignment,
+                    booth_assignment: @officer_assignment.booth_assignment,
+                    date: @officer_assignment.date,
+                    count: 100)
+
+    booth_name = @officer_assignment.booth_assignment.booth.name
+    date = I18n.l(@officer_assignment.date.to_date, format: :long)
+
+    visit new_officing_poll_recount_path(@poll)
+
+    expect(page).to have_content('Your recounts')
+
+    within("#poll_recount_#{recount.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('100')
+    end
+
+    select "#{booth_name}: #{date}", from: 'officer_assignment_id'
+    fill_in :count, with: '42'
+    click_button 'Save'
+
+    within("#poll_recount_#{recount.id}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+      expect(page).to have_content('42')
+    end
+    expect(page).to_not have_content('100')
+  end
+end
\ No newline at end of file
diff --git a/spec/features/officing/residence_spec.rb b/spec/features/officing/residence_spec.rb
new file mode 100644
index 000000000..69ffd9d21
--- /dev/null
+++ b/spec/features/officing/residence_spec.rb
@@ -0,0 +1,96 @@
+require 'rails_helper'
+
+feature 'Residence' do
+  let(:officer) { create(:poll_officer) }
+
+  feature "Officers without assignments" do
+
+    scenario "Can not access residence verification" do
+      login_as(officer.user)
+      visit officing_root_path
+
+      within("#side_menu") do
+        click_link "Validate document"
+      end
+
+      expect(page).to have_content("You don't have officing shifts today")
+
+      create(:poll_officer_assignment, officer: officer, date: 1.day.from_now)
+
+      visit new_officing_residence_path
+
+      expect(page).to have_content("You don't have officing shifts today")
+    end
+
+  end
+
+  feature "Assigned officers" do
+
+    background do
+      create(:poll_officer_assignment, officer: officer)
+      login_as(officer.user)
+      visit officing_root_path
+    end
+
+    scenario "Verify voter" do
+      within("#side_menu") do
+        click_link "Validate document"
+      end
+
+      select 'DNI', from: 'residence_document_type'
+      fill_in 'residence_document_number', with: "12345678Z"
+      fill_in 'residence_year_of_birth', with: '1980'
+
+      click_button 'Validate document'
+
+      expect(page).to have_content 'Document verified with Census'
+    end
+
+    scenario "Error on verify" do
+      within("#side_menu") do
+        click_link "Validate document"
+      end
+
+      click_button 'Validate document'
+      expect(page).to have_content(/\d errors? prevented the verification of this document/)
+    end
+
+    scenario "Error on Census (document number)" do
+      initial_failed_census_calls_count = officer.failed_census_calls_count
+      within("#side_menu") do
+        click_link "Validate document"
+      end
+
+      select 'DNI', from: 'residence_document_type'
+      fill_in 'residence_document_number', with: "9999999A"
+      fill_in 'residence_year_of_birth', with: '1980'
+
+      click_button 'Validate document'
+
+      expect(page).to have_content 'The Census was unable to verify this document'
+
+      officer.reload
+      fcc = FailedCensusCall.last
+      expect(fcc).to be
+      expect(fcc.poll_officer).to eq(officer)
+      expect(officer.failed_census_calls.last).to eq(fcc)
+      expect(officer.failed_census_calls_count).to eq(initial_failed_census_calls_count + 1)
+    end
+
+    scenario "Error on Census (year of birth)" do
+      within("#side_menu") do
+        click_link "Validate document"
+      end
+
+      select 'DNI', from: 'residence_document_type'
+      fill_in 'residence_document_number', with: "12345678Z"
+      fill_in 'residence_year_of_birth', with: '1981'
+
+      click_button 'Validate document'
+
+      expect(page).to have_content 'The Census was unable to verify this document'
+    end
+
+  end
+
+end
diff --git a/spec/features/officing/results_spec.rb b/spec/features/officing/results_spec.rb
new file mode 100644
index 000000000..1de3f4bdb
--- /dev/null
+++ b/spec/features/officing/results_spec.rb
@@ -0,0 +1,159 @@
+require 'rails_helper'
+
+feature 'Officing Results' do
+
+  background do
+    @poll_officer = create(:poll_officer)
+    @officer_assignment = create(:poll_officer_assignment, :final, officer: @poll_officer)
+    @poll = @officer_assignment.booth_assignment.poll
+    @poll.update(ends_at: 1.day.ago)
+    @question_1 = create(:poll_question, poll: @poll, valid_answers: "Yes,No")
+    @question_2 = create(:poll_question, poll: @poll, valid_answers: "Today,Tomorrow")
+    login_as(@poll_officer.user)
+  end
+
+  scenario 'Only polls where user is officer for results are accessible' do
+    regular_officer_assignment_1 = create(:poll_officer_assignment, officer: @poll_officer)
+    regular_officer_assignment_2 = create(:poll_officer_assignment, officer: @poll_officer)
+
+    not_allowed_poll_1 = create(:poll, :expired)
+    not_allowed_poll_2 = regular_officer_assignment_1.booth_assignment.poll
+    not_allowed_poll_2.update(ends_at: 1.day.ago)
+    not_allowed_poll_3 = regular_officer_assignment_2.booth_assignment.poll
+
+    visit root_path
+    click_link 'Polling officers'
+
+    expect(page).to have_content('Poll officing')
+    within('#side_menu') do
+      click_link 'Final recounts and results'
+    end
+
+    expect(page).to_not have_content(not_allowed_poll_1.name)
+    expect(page).to_not have_content(not_allowed_poll_2.name)
+    expect(page).to_not have_content(not_allowed_poll_3.name)
+    expect(page).to have_content(@poll.name)
+
+    visit new_officing_poll_result_path(not_allowed_poll_1)
+    expect(page).to have_content('You are allowed to add results for this poll')
+  end
+
+  scenario 'Add results' do
+    visit officing_root_path
+
+    within('#side_menu') do
+      click_link 'Final recounts and results'
+    end
+
+    within("#poll_#{@poll.id}") do
+      expect(page).to have_content(@poll.name)
+      click_link 'Add results'
+    end
+
+    expect(page).to_not have_content('Your results')
+
+    booth_name = @officer_assignment.booth_assignment.booth.name
+    date = I18n.l(@poll.starts_at.to_date, format: :long)
+    select booth_name, from: 'officer_assignment_id'
+    select date, from: 'date'
+
+    fill_in "questions[#{@question_1.id}][0]", with: '100'
+    fill_in "questions[#{@question_1.id}][1]", with: '200'
+
+    fill_in "questions[#{@question_2.id}][0]", with: '333'
+    fill_in "questions[#{@question_2.id}][1]", with: '444'
+
+    fill_in "whites", with: '66'
+    fill_in "nulls",  with: '77'
+
+    click_button 'Save'
+
+    expect(page).to have_content('Your results')
+
+    within("#results_#{@officer_assignment.booth_assignment_id}_#{@poll.starts_at.to_date.strftime('%Y%m%d')}") do
+      expect(page).to have_content(date)
+      expect(page).to have_content(booth_name)
+    end
+  end
+
+  scenario 'Edit result' do
+    partial_result = create(:poll_partial_result,
+                      officer_assignment: @officer_assignment,
+                      booth_assignment: @officer_assignment.booth_assignment,
+                      date: @poll.starts_at,
+                      question: @question_1,
+                      answer: @question_1.valid_answers[0],
+                      author: @poll_officer.user,
+                      amount: 7777)
+
+    visit officing_poll_results_path(@poll, date: I18n.l(partial_result.date), booth_assignment_id: partial_result.booth_assignment_id)
+
+    within("#question_#{@question_1.id}_0_result") { expect(page).to have_content('7777') }
+
+    visit new_officing_poll_result_path(@poll)
+
+    booth_name = partial_result.booth_assignment.booth.name
+    date = I18n.l(partial_result.date, format: :long)
+    select booth_name, from: 'officer_assignment_id'
+    select date, from: 'date'
+
+    fill_in "questions[#{@question_1.id}][0]", with: '5555'
+    fill_in "questions[#{@question_1.id}][1]", with: '200'
+    fill_in "whites", with: '6'
+    fill_in "nulls",  with: '7'
+
+    click_button 'Save'
+
+    within("#results_#{partial_result.booth_assignment_id}_#{partial_result.date.strftime('%Y%m%d')}") do
+      expect(page).to have_content(I18n.l(partial_result.date, format: :long))
+      expect(page).to have_content(partial_result.booth_assignment.booth.name)
+      click_link "See results"
+    end
+
+    expect(page).to_not have_content('7777')
+    within("#white_results") { expect(page).to have_content('6') }
+    within("#null_results")  { expect(page).to have_content('7') }
+    within("#question_#{@question_1.id}_0_result") { expect(page).to have_content('5555') }
+    within("#question_#{@question_1.id}_1_result") { expect(page).to have_content('200') }
+  end
+
+  scenario 'Index lists all questions and answers' do
+    partial_result = create(:poll_partial_result,
+                      officer_assignment: @officer_assignment,
+                      booth_assignment: @officer_assignment.booth_assignment,
+                      date: @poll.ends_at,
+                      question: @question_1,
+                      amount: 33)
+    white_result = create(:poll_white_result,
+                      officer_assignment: @officer_assignment,
+                      booth_assignment: @officer_assignment.booth_assignment,
+                      date: @poll.ends_at,
+                      amount: 21)
+    null_result = create(:poll_null_result,
+                      officer_assignment: @officer_assignment,
+                      booth_assignment: @officer_assignment.booth_assignment,
+                      date: @poll.ends_at,
+                      amount: 44)
+
+    visit officing_poll_results_path(@poll,
+                                     date: I18n.l(@poll.ends_at.to_date),
+                                     booth_assignment_id: @officer_assignment.booth_assignment_id)
+
+    expect(page).to have_content(I18n.l(@poll.ends_at.to_date, format: :long))
+    expect(page).to have_content(@officer_assignment.booth_assignment.booth.name)
+
+    expect(page).to have_content(@question_1.title)
+    @question_1.valid_answers.each_with_index do |answer, i|
+      within("#question_#{@question_1.id}_#{i}_result") { expect(page).to have_content(answer) }
+    end
+
+    expect(page).to have_content(@question_2.title)
+    @question_2.valid_answers.each_with_index do |answer, i|
+      within("#question_#{@question_2.id}_#{i}_result") { expect(page).to have_content(answer) }
+    end
+
+    within('#white_results') { expect(page).to have_content('21') }
+    within('#null_results') { expect(page).to have_content('44') }
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/officing/voters_spec.rb b/spec/features/officing/voters_spec.rb
new file mode 100644
index 000000000..2d28c7e77
--- /dev/null
+++ b/spec/features/officing/voters_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+feature 'Voters' do
+
+  let(:officer) { create(:poll_officer) }
+
+  background do
+    login_as(officer.user)
+    create(:geozone, :in_census)
+
+    #remove once foundation.equalizer js error has been fixed
+    Capybara.current_driver = :poltergeist_no_js_errors
+  end
+
+  scenario "Can vote", :js do
+    poll = create(:poll_officer_assignment, officer: officer).booth_assignment.poll
+
+    visit new_officing_residence_path
+    officing_verify_residence
+
+    expect(page).to have_content "Polls"
+    expect(page).to have_content poll.name
+
+    click_button "Confirm vote"
+
+    expect(page).to have_content "Vote introduced!"
+    expect(page).to_not have_button "Confirm vote"
+
+    page.evaluate_script("window.location.reload()")
+    expect(page).to have_content "Has already participated in this poll"
+    expect(page).to_not have_button "Confirm vote"
+  end
+
+  scenario "Already voted", :js do
+    poll1 = create(:poll)
+    poll2 = create(:poll)
+
+    user = create(:user, :level_two)
+    voter = create(:poll_voter, poll: poll1, user: user)
+
+    visit new_officing_voter_path(id: voter.user.id)
+
+    within("#poll_#{poll1.id}") do
+      expect(page).to have_content "Has already participated in this poll"
+      expect(page).to_not have_button "Confirm vote"
+    end
+
+    within("#poll_#{poll2.id}") do
+      expect(page).to have_button "Confirm vote"
+    end
+  end
+
+  scenario "Had already verified his residence, but is not level 2 yet", :js do
+    user = create(:user, residence_verified_at: Time.current, document_type: "1", document_number: "12345678Z")
+    expect(user).to_not be_level_two_verified
+    poll = create(:poll_officer_assignment, officer: officer).booth_assignment.poll
+
+    visit new_officing_residence_path
+    officing_verify_residence
+
+    expect(page).to have_content "Polls"
+    expect(page).to have_content poll.name
+  end
+
+  #Fix and use answerable_by(user)
+  xscenario "Display only answerable polls"
+end
diff --git a/spec/features/officing_spec.rb b/spec/features/officing_spec.rb
new file mode 100644
index 000000000..d4cb416a1
--- /dev/null
+++ b/spec/features/officing_spec.rb
@@ -0,0 +1,109 @@
+require 'rails_helper'
+
+feature 'Poll Officing' do
+  let(:user) { create(:user) }
+
+  scenario 'Access as regular user is not authorized' do
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Polling officers")
+    visit officing_root_path
+
+    expect(current_path).not_to eq(officing_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as moderator is not authorized' do
+    create(:moderator, user: user)
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Polling officers")
+    visit officing_root_path
+
+    expect(current_path).not_to eq(officing_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as manager is not authorized' do
+    create(:manager, user: user)
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Polling officers")
+    visit officing_root_path
+
+    expect(current_path).not_to eq(officing_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as a valuator is not authorized' do
+    create(:valuator, user: user)
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Polling officers")
+    visit officing_root_path
+
+    expect(current_path).not_to eq(officing_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as an poll officer is authorized' do
+    create(:poll_officer, user: user)
+    create(:poll)
+    login_as(user)
+    visit root_path
+
+    expect(page).to have_link("Polling officers")
+    click_on "Polling officers"
+
+    expect(current_path).to eq(officing_root_path)
+    expect(page).to_not have_content "You do not have permission to access this page"
+  end
+
+  scenario 'Access as an administrator is authorized' do
+    create(:administrator, user: user)
+    create(:poll)
+    login_as(user)
+    visit root_path
+
+    expect(page).to have_link("Polling officers")
+    click_on "Polling officers"
+
+    expect(current_path).to eq(officing_root_path)
+    expect(page).to_not have_content "You do not have permission to access this page"
+  end
+
+  scenario "Poll officer access links" do
+    create(:poll_officer, user: user)
+    login_as(user)
+    visit root_path
+
+    expect(page).to have_link("Polling officers")
+    expect(page).to_not have_link('Valuation')
+    expect(page).to_not have_link('Administration')
+    expect(page).to_not have_link('Moderation')
+  end
+
+  scenario 'Officing dashboard' do
+    create(:poll_officer, user: user)
+    create(:poll)
+    login_as(user)
+    visit root_path
+
+    click_link 'Polling officers'
+
+    expect(current_path).to eq(officing_root_path)
+    expect(page).to have_css('#officing_menu')
+    expect(page).to_not have_css('#valuation_menu')
+    expect(page).to_not have_css('#admin_menu')
+    expect(page).to_not have_css('#moderation_menu')
+  end
+
+end
\ No newline at end of file
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb
new file mode 100644
index 000000000..047c71146
--- /dev/null
+++ b/spec/features/polls/polls_spec.rb
@@ -0,0 +1,197 @@
+require 'rails_helper'
+
+feature 'Polls' do
+
+  context '#index' do
+
+    scenario 'Polls can be listed' do
+      polls = create_list(:poll, 3)
+
+      visit polls_path
+
+      polls.each do |poll|
+        expect(page).to have_content(poll.name)
+        expect(page).to have_link("Participate in this poll")
+      end
+    end
+
+    scenario 'Filtering polls' do
+      create(:poll, name: "Current poll")
+      create(:poll, :incoming, name: "Incoming poll")
+      create(:poll, :expired, name: "Expired poll")
+
+      visit polls_path
+      expect(page).to have_content('Current poll')
+      expect(page).to have_link('Participate in this poll')
+      expect(page).to_not have_content('Incoming poll')
+      expect(page).to_not have_content('Expired poll')
+
+      visit polls_path(filter: 'incoming')
+      expect(page).to_not have_content('Current poll')
+      expect(page).to have_content('Incoming poll')
+      expect(page).to have_link('More information')
+      expect(page).to_not have_content('Expired poll')
+
+      visit polls_path(filter: 'expired')
+      expect(page).to_not have_content('Current poll')
+      expect(page).to_not have_content('Incoming poll')
+      expect(page).to have_content('Expired poll')
+      expect(page).to have_link('Poll ended')
+    end
+
+    scenario "Current filter is properly highlighted" do
+      visit polls_path
+      expect(page).to_not have_link('Open')
+      expect(page).to have_link('Incoming')
+      expect(page).to have_link('Expired')
+
+      visit polls_path(filter: 'incoming')
+      expect(page).to have_link('Open')
+      expect(page).to_not have_link('Incoming')
+      expect(page).to have_link('Expired')
+
+      visit polls_path(filter: 'expired')
+      expect(page).to have_link('Open')
+      expect(page).to have_link('Incoming')
+      expect(page).to_not have_link('Expired')
+    end
+  end
+
+  context 'Show' do
+    let(:geozone) { create(:geozone) }
+    let(:poll) { create(:poll) }
+
+    scenario 'Lists questions from proposals as well as regular ones' do
+      normal_question = create(:poll_question, poll: poll)
+      proposal_question = create(:poll_question, poll: poll, proposal: create(:proposal))
+
+      visit poll_path(poll)
+      expect(page).to have_content(poll.name)
+
+      expect(page).to have_content(normal_question.title)
+      expect(page).to have_content(proposal_question.title)
+    end
+
+    scenario 'Non-logged in users' do
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      visit poll_path(poll)
+
+      expect(page).to have_content('Han Solo')
+      expect(page).to have_content('Chewbacca')
+      expect(page).to have_content('You must Sign in or Sign up to participate')
+
+      expect(page).to_not have_link('Han Solo')
+      expect(page).to_not have_link('Chewbacca')
+    end
+
+    scenario 'Level 1 users' do
+      poll.update(geozone_restricted: true)
+      poll.geozones << geozone
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      login_as(create(:user, geozone: geozone))
+      visit poll_path(poll)
+
+      expect(page).to have_content('You must verify your account in order to answer')
+
+      expect(page).to have_content('Han Solo')
+      expect(page).to have_content('Chewbacca')
+
+      expect(page).to_not have_link('Han Solo')
+      expect(page).to_not have_link('Chewbacca')
+    end
+
+    scenario 'Level 2 users in an incoming poll' do
+      incoming_poll = create(:poll, :incoming, geozone_restricted: true)
+      incoming_poll.geozones << geozone
+      create(:poll_question, poll: incoming_poll, valid_answers: 'Rey, Finn')
+      login_as(create(:user, :level_two, geozone: geozone))
+
+      visit poll_path(incoming_poll)
+
+      expect(page).to have_content('Rey')
+      expect(page).to have_content('Finn')
+      expect(page).to_not have_link('Rey')
+      expect(page).to_not have_link('Finn')
+
+      expect(page).to have_content('This poll has not yet started')
+    end
+
+    scenario 'Level 2 users in an expired poll' do
+      expired_poll = create(:poll, :expired, geozone_restricted: true)
+      expired_poll.geozones << geozone
+      create(:poll_question, poll: expired_poll, valid_answers: 'Luke, Leia')
+      login_as(create(:user, :level_two, geozone: geozone))
+
+      visit poll_path(expired_poll)
+
+      expect(page).to have_content('Luke')
+      expect(page).to have_content('Leia')
+      expect(page).to_not have_link('Luke')
+      expect(page).to_not have_link('Leia')
+
+      expect(page).to have_content('This poll has finished')
+    end
+
+    scenario 'Level 2 users in a poll with questions for a geozone which is not theirs' do
+      poll.update(geozone_restricted: true)
+      poll.geozones << create(:geozone)
+      create(:poll_question, poll: poll, valid_answers: 'Vader, Palpatine')
+      login_as(create(:user, :level_two))
+
+      visit poll_path(poll)
+
+      expect(page).to have_content('Vader')
+      expect(page).to have_content('Palpatine')
+      expect(page).to_not have_link('Vader')
+      expect(page).to_not have_link('Palpatine')
+    end
+
+    scenario 'Level 2 users reading a same-geozone poll' do
+      poll.update(geozone_restricted: true)
+      poll.geozones << geozone
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      login_as(create(:user, :level_two, geozone: geozone))
+      visit poll_path(poll)
+
+      expect(page).to have_link('Han Solo')
+      expect(page).to have_link('Chewbacca')
+    end
+
+    scenario 'Level 2 users reading a all-geozones poll' do
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      login_as(create(:user, :level_two))
+      visit poll_path(poll)
+
+      expect(page).to have_link('Han Solo')
+      expect(page).to have_link('Chewbacca')
+    end
+
+    scenario 'Level 2 users who have already answered' do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      user = create(:user, :level_two)
+      create(:poll_answer, question: question, author: user, answer: 'Chewbacca')
+
+      login_as user
+      visit poll_path(poll)
+
+      expect(page).to have_link('Han Solo')
+      expect(page).to_not have_link('Chewbacca')
+      expect(page).to have_content('Chewbacca')
+    end
+
+    scenario 'Level 2 users answering', :js do
+      poll.update(geozone_restricted: true)
+      poll.geozones << geozone
+      create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      user = create(:user, :level_two, geozone: geozone)
+      login_as user
+      visit poll_path(poll)
+
+      click_link 'Han Solo'
+
+      expect(page).to_not have_link('Han Solo')
+      expect(page).to have_link('Chewbacca')
+    end
+
+  end
+end
diff --git a/spec/features/polls/questions_spec.rb b/spec/features/polls/questions_spec.rb
new file mode 100644
index 000000000..6f2225175
--- /dev/null
+++ b/spec/features/polls/questions_spec.rb
@@ -0,0 +1,112 @@
+require 'rails_helper'
+
+feature 'Poll Questions' do
+
+  scenario 'Lists questions from proposals before regular questions' do
+    poll = create(:poll)
+    normal_question = create(:poll_question, poll: poll)
+    proposal_question = create(:poll_question, proposal: create(:proposal), poll: poll)
+
+    visit poll_path(poll)
+
+    expect(proposal_question.title).to appear_before(normal_question.title)
+  end
+
+  scenario 'shows the author visible name instead of a link to the author' do
+    poll = create(:poll)
+    question_with_author = create(:poll_question, poll: poll)
+    question_with_author_visible_name = create(:poll_question, poll: poll, author_visible_name: 'potato')
+
+    visit question_path(question_with_author)
+    expect(page).to have_link(question_with_author.author.name)
+
+    visit question_path(question_with_author_visible_name)
+    expect(page).to_not have_link(question_with_author_visible_name.author.name)
+    expect(page).to have_content(question_with_author_visible_name.author_visible_name)
+  end
+
+  context 'Answering' do
+    let(:geozone) { create(:geozone) }
+    let(:poll) { create(:poll, geozone_restricted: true, geozone_ids: [geozone.id]) }
+
+    scenario 'Non-logged in users' do
+      question = create(:poll_question, valid_answers: 'Han Solo, Chewbacca')
+
+      visit question_path(question)
+
+      expect(page).to have_content('You must Sign in or Sign up to participate')
+    end
+
+    scenario 'Level 1 users' do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+
+      login_as(create(:user, geozone: geozone))
+      visit question_path(question)
+
+      expect(page).to have_content('You must verify your account in order to answer')
+    end
+
+    scenario 'Level 2 users in an poll question for a geozone which is not theirs' do
+
+      other_poll = create(:poll, geozone_restricted: true, geozone_ids: [create(:geozone).id])
+      question = create(:poll_question, poll: other_poll, valid_answers: 'Vader, Palpatine')
+
+      login_as(create(:user, :level_two, geozone: geozone))
+      visit question_path(question)
+
+      expect(page).to have_content('This question is not available on your geozone')
+    end
+
+    scenario 'Level 2 users who can answer' do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+
+      login_as(create(:user, :level_two, geozone: geozone))
+      visit question_path(question)
+
+      expect(page).to have_link('Answer this question')
+    end
+
+    scenario 'Level 2 users who have already answered' do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+
+      user = create(:user, :level_two, geozone: geozone)
+      create(:poll_answer, question: question, author: user, answer: 'Chewbacca')
+
+      login_as user
+      visit question_path(question)
+
+      expect(page).to have_link('Answer this question')
+    end
+
+    scenario 'Level 2 users answering', :js do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      user = create(:user, :level_two, geozone: geozone)
+
+      login_as user
+      visit question_path(question)
+
+      expect(page).to have_link('Answer this question')
+    end
+
+    scenario 'Records participation', :js do
+      question = create(:poll_question, poll: poll, valid_answers: 'Han Solo, Chewbacca')
+      user = create(:user, :level_two, geozone: geozone, gender: 'female', date_of_birth: 33.years.ago)
+
+      login_as user
+      visit question_path(question)
+
+      click_link 'Answer this question'
+      click_link 'Han Solo'
+
+      expect(page).to_not have_link('Han Solo')
+
+      voter = poll.voters.first
+      expect(voter.document_number).to eq(user.document_number)
+      expect(voter.geozone_id).to eq(user.geozone_id)
+      expect(voter.gender).to eq(user.gender)
+      expect(voter.age).to eq(33)
+      expect(voter.poll_id).to eq(poll.id)
+    end
+
+  end
+end
diff --git a/spec/features/proposal_ballots_spec.rb b/spec/features/proposal_ballots_spec.rb
index 01ba71bf7..8f5e99eb8 100644
--- a/spec/features/proposal_ballots_spec.rb
+++ b/spec/features/proposal_ballots_spec.rb
@@ -10,7 +10,7 @@ feature 'Proposal ballots' do
     expect(page).to_not have_css("#next-voting")
     expect(page).to have_css("#featured-proposals")
 
-    create_successfull_proposals
+    create_successful_proposals
 
     visit proposals_path
 
@@ -18,22 +18,22 @@ feature 'Proposal ballots' do
     expect(page).to_not have_css("#featured-proposals")
   end
 
-  scenario 'Successfull proposals do not show support buttons in index' do
-    successfull_proposals = create_successfull_proposals
+  scenario 'Successful proposals do not show support buttons in index' do
+    successful_proposals = create_successful_proposals
 
     visit proposals_path
 
-    successfull_proposals.each do |proposal|
+    successful_proposals.each do |proposal|
       within("#proposal_#{proposal.id}_votes") do
         expect(page).to have_content "This proposal has reached the required supports"
       end
     end
   end
 
-  scenario 'Successfull proposals do not show support buttons in show' do
-    successfull_proposals = create_successfull_proposals
+  scenario 'Successful proposals do not show support buttons in show' do
+    successful_proposals = create_successful_proposals
 
-    successfull_proposals.each do |proposal|
+    successful_proposals.each do |proposal|
       visit proposal_path(proposal)
       within("#proposal_#{proposal.id}_votes") do
         expect(page).to have_content "This proposal has reached the required supports"
@@ -41,15 +41,5 @@ feature 'Proposal ballots' do
     end
   end
 
-  scenario 'Successfull proposals are listed in the proposal ballots index' do
-    successfull_proposals = create_successfull_proposals
-
-    visit proposal_ballots_path
-
-    successfull_proposals.each do |proposal|
-      expect(page).to have_content(proposal.title)
-    end
-  end
-
 end
 
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index c7949a91d..843b74bf5 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -1372,3 +1372,69 @@ feature 'Proposals' do
   end
 
 end
+
+feature 'Successful proposals' do
+
+  scenario 'Banner shows in proposal index' do
+    create_featured_proposals
+
+    visit proposals_path
+    expect(page).to_not have_css("#next-voting")
+    expect(page).to have_css("#featured-proposals")
+
+    create_successful_proposals
+
+    visit proposals_path
+
+    expect(page).to have_css("#next-voting")
+    expect(page).to_not have_css("#featured-proposals")
+  end
+
+  scenario 'Successful proposals do not show support buttons in index' do
+    successful_proposals = create_successful_proposals
+
+    visit proposals_path
+
+    successful_proposals.each do |proposal|
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to_not have_css(".supports")
+        expect(page).to have_content "This proposal has reached the required supports"
+      end
+    end
+  end
+
+  scenario 'Successful proposals do not show support buttons in show' do
+    successful_proposals = create_successful_proposals
+
+    successful_proposals.each do |proposal|
+      visit proposal_path(proposal)
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to_not have_css(".supports")
+        expect(page).to have_content "This proposal has reached the required supports"
+      end
+    end
+  end
+
+  scenario 'Successful proposals show create question button to admin users' do
+    successful_proposals = create_successful_proposals
+
+    visit proposals_path
+
+    successful_proposals.each do |proposal|
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to_not have_link "Create question"
+      end
+    end
+
+    login_as(create(:administrator).user)
+
+    visit proposals_path
+
+    successful_proposals.each do |proposal|
+      within("#proposal_#{proposal.id}_votes") do
+        expect(page).to have_link "Create question"
+      end
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb
index f6e930cc6..81e4eceae 100644
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -61,6 +61,8 @@ feature 'Valuation budget investments' do
   end
 
   scenario "Index filtering by heading", :js do
+    Capybara.current_driver = :poltergeist_no_js_errors
+
     group = create(:budget_group, budget: @budget)
     heading1 = create(:budget_heading, name: "District 9", group: group)
     heading2 = create(:budget_heading, name: "Down to the river", group: group)
diff --git a/spec/features/valuation/spending_proposals_spec.rb b/spec/features/valuation/spending_proposals_spec.rb
index 25c5dfa61..035ed59fd 100644
--- a/spec/features/valuation/spending_proposals_spec.rb
+++ b/spec/features/valuation/spending_proposals_spec.rb
@@ -83,6 +83,8 @@ feature 'Valuation spending proposals' do
   end
 
   scenario "Index filtering by geozone", :js do
+    Capybara.current_driver = :poltergeist_no_js_errors
+
     geozone = create(:geozone, name: "District 9")
     spending_proposal1 = create(:spending_proposal, title: "Realocate visitors", geozone: geozone)
     spending_proposal2 = create(:spending_proposal, title: "Destroy the city")
diff --git a/spec/features/valuation_spec.rb b/spec/features/valuation_spec.rb
index 2dcdc91c1..a0a4c9ba5 100644
--- a/spec/features/valuation_spec.rb
+++ b/spec/features/valuation_spec.rb
@@ -46,6 +46,19 @@ feature 'Valuation' do
     expect(page).to have_content "You do not have permission to access this page"
   end
 
+  scenario 'Access as poll officer is not authorized' do
+    create(:poll_officer, user: user)
+    login_as(user)
+    visit root_path
+
+    expect(page).to_not have_link("Valuation")
+    visit valuation_root_path
+
+    expect(current_path).not_to eq(valuation_root_path)
+    expect(current_path).to eq(proposals_path)
+    expect(page).to have_content "You do not have permission to access this page"
+  end
+
   scenario 'Access as a valuator is authorized' do
     create(:valuator, user: user)
     login_as(user)
diff --git a/spec/features/verification/residence_spec.rb b/spec/features/verification/residence_spec.rb
index cdf33dfab..ed2ffd083 100644
--- a/spec/features/verification/residence_spec.rb
+++ b/spec/features/verification/residence_spec.rb
@@ -22,6 +22,31 @@ feature 'Residence' do
     expect(page).to have_content 'Residence verified'
   end
 
+  scenario 'When trying to verify a deregistered account old votes are reassigned' do
+    erased_user = create(:user, document_number: '12345678Z', document_type: '1', erased_at: Time.current)
+    vote = create(:vote, voter: erased_user)
+    new_user = create(:user)
+
+    login_as(new_user)
+
+    visit account_path
+    click_link 'Verify my account'
+
+    fill_in 'residence_document_number', with: '12345678Z'
+    select 'DNI', from: 'residence_document_type'
+    select_date '31-December-1980', from: 'residence_date_of_birth'
+    fill_in 'residence_postal_code', with: '28013'
+    check 'residence_terms_of_service'
+
+    click_button 'Verify residence'
+
+    expect(page).to have_content 'Residence verified'
+
+    expect(vote.reload.voter).to eq(new_user)
+    expect(erased_user.reload.document_number).to be_blank
+    expect(new_user.reload.document_number).to eq('12345678Z')
+  end
+
   scenario 'Error on verify' do
     user = create(:user)
     login_as(user)
@@ -102,24 +127,4 @@ feature 'Residence' do
     expect(page).to have_content "You have reached the maximum number of attempts. Please try again later."
     expect(current_path).to eq(account_path)
   end
-
-  scenario 'Error when trying to verify a deregistered account' do
-    create(:user, document_number: '12345678Z', document_type: '1', erased_at: Time.now)
-
-    login_as(create(:user))
-
-    visit account_path
-    click_link 'Verify my account'
-
-    fill_in 'residence_document_number', with: "12345678Z"
-    select 'DNI', from: 'residence_document_type'
-    select_date '31-December-1980', from: 'residence_date_of_birth'
-    fill_in 'residence_postal_code', with: '28013'
-    check 'residence_terms_of_service'
-
-    click_button 'Verify residence'
-
-    expect(page).to_not have_content 'Residence verified'
-    expect(page).to have_content 'has already been taken'
-  end
 end
diff --git a/spec/helpers/admin_helper_spec.rb b/spec/helpers/admin_helper_spec.rb
new file mode 100644
index 000000000..0239f1926
--- /dev/null
+++ b/spec/helpers/admin_helper_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe AdminHelper do
+
+  describe "#admin_submit_action" do
+
+    it "returns new when the the resource has not been persisted" do
+      poll = build(:poll)
+      expect(admin_submit_action(poll)).to eq("new")
+    end
+
+    it "returns edit when the the resource has been persisted" do
+      poll = create(:poll)
+      expect(admin_submit_action(poll)).to eq("edit")
+    end
+
+  end
+
+end
\ No newline at end of file
diff --git a/spec/lib/age_spec.rb b/spec/lib/age_spec.rb
new file mode 100644
index 000000000..6e1012fd4
--- /dev/null
+++ b/spec/lib/age_spec.rb
@@ -0,0 +1,58 @@
+require 'rails_helper'
+
+describe Age do
+  describe '.in_years' do
+    it "handles nils" do
+      expect(Age.in_years(nil)).to be_nil
+    end
+
+    it "calculates age correctly for common dates" do
+      d = Date.new(1980, 3, 13)
+      expect(Age.in_years(d, Date.new(2000, 3, 12))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000, 3, 13))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000, 3, 14))).to eq(20)
+    end
+
+    it "calculates age correctly for people born near a year's limit" do
+      d = Date.new(1980, 12, 31)
+      expect(Age.in_years(d, Date.new(2000, 12, 30))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000, 12, 31))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  1,  1))).to eq(20)
+
+      d = Date.new(1980, 1, 1)
+      expect(Age.in_years(d, Date.new(2000, 12, 31))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  1,  1))).to eq(21)
+      expect(Age.in_years(d, Date.new(2001,  1,  2))).to eq(21)
+    end
+
+    it "calculates age correctly for people born around February the 29th" do
+      # 1980 and 2000 are leap years. 2001 is a regular year
+      d = Date.new(1980, 2, 29)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+
+      d = Date.new(1980, 2, 28)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(21)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+
+      d = Date.new(1980, 3, 1)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+    end
+  end
+end
diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb
index 8c4e8a1ef..5312221b8 100644
--- a/spec/models/abilities/administrator_spec.rb
+++ b/spec/models/abilities/administrator_spec.rb
@@ -67,5 +67,4 @@ describe "Abilities::Administrator" do
 
   it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'valuating'))) }
   it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'finished'))) }
-
 end
diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb
index f82bcc839..7c02f50fd 100644
--- a/spec/models/abilities/common_spec.rb
+++ b/spec/models/abilities/common_spec.rb
@@ -3,12 +3,17 @@ require 'cancan/matchers'
 
 describe "Abilities::Common" do
   subject(:ability) { Ability.new(user) }
+  let(:geozone)     { create(:geozone)  }
 
-  let(:user) { create(:user) }
+  let(:user) { create(:user, geozone: geozone) }
+
+  let(:debate)       { create(:debate)   }
+  let(:comment)      { create(:comment)  }
+  let(:proposal)     { create(:proposal) }
+  let(:own_debate)   { create(:debate,   author: user) }
+  let(:own_comment)  { create(:comment,  author: user) }
+  let(:own_proposal) { create(:proposal, author: user) }
 
-  let(:debate) { create(:debate) }
-  let(:comment) { create(:comment) }
-  let(:proposal) { create(:proposal) }
   let(:accepting_budget) { create(:budget, phase: 'accepting') }
   let(:reviewing_budget) { create(:budget, phase: 'reviewing') }
   let(:selecting_budget) { create(:budget, phase: 'selecting') }
@@ -25,122 +30,188 @@ describe "Abilities::Common" do
   let(:ballot_in_accepting_budget) { create(:budget_ballot, budget: accepting_budget) }
   let(:ballot_in_selecting_budget) { create(:budget_ballot, budget: selecting_budget) }
   let(:ballot_in_balloting_budget) { create(:budget_ballot, budget: balloting_budget) }
-  let(:own_debate) { create(:debate, author: user) }
-  let(:own_comment) { create(:comment, author: user) }
-  let(:own_proposal) { create(:proposal, author: user) }
+
+  let(:current_poll)  { create(:poll) }
+  let(:incoming_poll) { create(:poll, :incoming) }
+  let(:incoming_poll_from_own_geozone) { create(:poll, :incoming, geozone_restricted: true, geozones: [geozone]) }
+  let(:incoming_poll_from_other_geozone) { create(:poll, :incoming, geozone_restricted: true, geozones: [create(:geozone)]) }
+  let(:expired_poll)  { create(:poll, :expired)  }
+  let(:expired_poll_from_own_geozone) { create(:poll, :expired, geozone_restricted: true, geozones: [geozone]) }
+  let(:expired_poll_from_other_geozone) { create(:poll, :expired, geozone_restricted: true, geozones: [create(:geozone)]) }
+  let(:poll) { create(:poll, geozone_restricted: false) }
+  let(:poll_from_own_geozone) { create(:poll, geozone_restricted: true, geozones: [geozone]) }
+  let(:poll_from_other_geozone) { create(:poll, geozone_restricted: true, geozones: [create(:geozone)]) }
+
+  let(:poll_question_from_own_geozone)   { create(:poll_question, poll: poll_from_own_geozone)  }
+  let(:poll_question_from_other_geozone) { create(:poll_question, poll: poll_from_other_geozone) }
+  let(:poll_question_from_all_geozones)  { create(:poll_question, poll: poll) }
+
+  let(:expired_poll_question_from_own_geozone)   { create(:poll_question, poll: expired_poll_from_own_geozone) }
+  let(:expired_poll_question_from_other_geozone) { create(:poll_question, poll: expired_poll_from_other_geozone) }
+  let(:expired_poll_question_from_all_geozones)  { create(:poll_question, poll: expired_poll) }
+
+  let(:incoming_poll_question_from_own_geozone)   { create(:poll_question, poll: incoming_poll_from_own_geozone) }
+  let(:incoming_poll_question_from_other_geozone) { create(:poll_question, poll: incoming_poll_from_other_geozone) }
+  let(:incoming_poll_question_from_all_geozones)  { create(:poll_question, poll: incoming_poll) }
 
   it { should be_able_to(:index, Debate) }
-  it { should be_able_to(:show, debate) }
-  it { should be_able_to(:vote, debate) }
+  it { should be_able_to(:show, debate)  }
+  it { should be_able_to(:vote, debate)  }
 
   it { should be_able_to(:show, user) }
   it { should be_able_to(:edit, user) }
 
   it { should be_able_to(:create, Comment) }
-  it { should be_able_to(:vote, Comment) }
+  it { should be_able_to(:vote, Comment)   }
 
-  it { should be_able_to(:index, Proposal) }
-  it { should be_able_to(:show, proposal) }
+  it { should     be_able_to(:index, Proposal) }
+  it { should     be_able_to(:show, proposal) }
   it { should_not be_able_to(:vote, Proposal) }
   it { should_not be_able_to(:vote_featured, Proposal) }
 
-  it { should be_able_to(:index, SpendingProposal) }
-  it { should_not be_able_to(:create, SpendingProposal) }
+  it { should     be_able_to(:index, SpendingProposal)   }
+  it { should_not be_able_to(:create, SpendingProposal)  }
   it { should_not be_able_to(:destroy, SpendingProposal) }
 
-  it { should_not be_able_to(:comment_as_administrator, debate) }
-  it { should_not be_able_to(:comment_as_moderator, debate) }
+  it { should_not be_able_to(:comment_as_administrator, debate)   }
+  it { should_not be_able_to(:comment_as_moderator, debate)       }
   it { should_not be_able_to(:comment_as_administrator, proposal) }
-  it { should_not be_able_to(:comment_as_moderator, proposal) }
+  it { should_not be_able_to(:comment_as_moderator, proposal)     }
 
-  it { should be_able_to(:new, DirectMessage) }
+  it { should     be_able_to(:new,    DirectMessage) }
   it { should_not be_able_to(:create, DirectMessage) }
-  it { should_not be_able_to(:show, DirectMessage) }
+  it { should_not be_able_to(:show,   DirectMessage) }
 
   describe 'flagging content' do
-    it { should be_able_to(:flag, debate) }
+    it { should be_able_to(:flag, debate)   }
     it { should be_able_to(:unflag, debate) }
 
-    it { should be_able_to(:flag, comment) }
+    it { should be_able_to(:flag, comment)   }
     it { should be_able_to(:unflag, comment) }
 
-    it { should be_able_to(:flag, proposal) }
+    it { should be_able_to(:flag, proposal)   }
     it { should be_able_to(:unflag, proposal) }
 
     describe "own content" do
-      it { should_not be_able_to(:flag, own_comment) }
+      it { should_not be_able_to(:flag, own_comment)   }
       it { should_not be_able_to(:unflag, own_comment) }
 
-      it { should_not be_able_to(:flag, own_debate) }
+      it { should_not be_able_to(:flag, own_debate)   }
       it { should_not be_able_to(:unflag, own_debate) }
 
-      it { should_not be_able_to(:flag, own_proposal) }
+      it { should_not be_able_to(:flag, own_proposal)   }
       it { should_not be_able_to(:unflag, own_proposal) }
     end
   end
 
   describe "other users" do
     let(:other_user) { create(:user) }
-    it { should be_able_to(:show, other_user) }
+
+    it { should     be_able_to(:show, other_user) }
     it { should_not be_able_to(:edit, other_user) }
   end
 
   describe "editing debates" do
     let(:own_debate_non_editable) { create(:debate, author: user) }
+
     before { allow(own_debate_non_editable).to receive(:editable?).and_return(false) }
 
-    it { should be_able_to(:edit, own_debate) }
-    it { should_not be_able_to(:edit, debate) } # Not his
+    it { should     be_able_to(:edit, own_debate)              }
+    it { should_not be_able_to(:edit, debate)                  } # Not his
     it { should_not be_able_to(:edit, own_debate_non_editable) }
   end
 
   describe "editing proposals" do
     let(:own_proposal_non_editable) { create(:proposal, author: user) }
+
     before { allow(own_proposal_non_editable).to receive(:editable?).and_return(false) }
 
-    it { should be_able_to(:edit, own_proposal) }
-    it { should_not be_able_to(:edit, proposal) } # Not his
+    it { should be_able_to(:edit, own_proposal)                  }
+    it { should_not be_able_to(:edit, proposal)                  } # Not his
     it { should_not be_able_to(:edit, own_proposal_non_editable) }
   end
 
   describe "when level 2 verified" do
     let(:own_spending_proposal) { create(:spending_proposal, author: user) }
+
     let(:own_direct_message) { create(:direct_message, sender: user) }
     before{ user.update(residence_verified_at: Time.current, confirmed_phone: "1") }
 
-    it { should be_able_to(:vote, Proposal) }
-    it { should be_able_to(:vote_featured, Proposal) }
+    describe "Proposal" do
+      it { should be_able_to(:vote, Proposal) }
+      it { should be_able_to(:vote_featured, Proposal) }
+    end
 
-    it { should be_able_to(:create, SpendingProposal) }
-    it { should_not be_able_to(:destroy, create(:spending_proposal)) }
-    it { should_not be_able_to(:destroy, own_spending_proposal) }
+    describe "Spending Proposal" do
+      it { should be_able_to(:create, SpendingProposal)                }
+      it { should_not be_able_to(:destroy, create(:spending_proposal)) }
+      it { should_not be_able_to(:destroy, own_spending_proposal)      }
+    end
 
-    it { should be_able_to(:create, investment_in_accepting_budget) }
-    it { should_not be_able_to(:create, investment_in_selecting_budget) }
-    it { should_not be_able_to(:create, investment_in_balloting_budget) }
+    describe "Direct Message" do
+      it { should     be_able_to(:new,    DirectMessage)           }
+      it { should     be_able_to(:create, DirectMessage)           }
+      it { should     be_able_to(:show,   own_direct_message)      }
+      it { should_not be_able_to(:show,   create(:direct_message)) }
+    end
 
-    it { should_not be_able_to(:vote, investment_in_accepting_budget) }
-    it { should be_able_to(:vote, investment_in_selecting_budget) }
-    it { should_not be_able_to(:vote, investment_in_balloting_budget) }
+    describe "Poll" do
+      it { should     be_able_to(:answer, current_poll)  }
+      it { should_not be_able_to(:answer, expired_poll)  }
+      it { should_not be_able_to(:answer, incoming_poll) }
 
-    it { should_not be_able_to(:destroy, investment_in_accepting_budget) }
-    it { should_not be_able_to(:destroy, investment_in_reviewing_budget) }
-    it { should_not be_able_to(:destroy, investment_in_selecting_budget) }
-    it { should_not be_able_to(:destroy, investment_in_balloting_budget) }
+      it { should     be_able_to(:answer, poll_question_from_own_geozone)   }
+      it { should     be_able_to(:answer, poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, poll_question_from_other_geozone) }
 
-    it { should be_able_to(:destroy, own_investment_in_accepting_budget) }
-    it { should be_able_to(:destroy, own_investment_in_reviewing_budget) }
-    it { should_not be_able_to(:destroy, own_investment_in_selecting_budget) }
-    it { should_not be_able_to(:destroy, investment_in_balloting_budget) }
+      it { should_not be_able_to(:answer, expired_poll_question_from_own_geozone)   }
+      it { should_not be_able_to(:answer, expired_poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, expired_poll_question_from_other_geozone) }
 
-    it { should_not be_able_to(:create, ballot_in_accepting_budget) }
-    it { should_not be_able_to(:create, ballot_in_selecting_budget) }
-    it { should be_able_to(:create, ballot_in_balloting_budget) }
+      it { should_not be_able_to(:answer, incoming_poll_question_from_own_geozone)   }
+      it { should_not be_able_to(:answer, incoming_poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, incoming_poll_question_from_other_geozone) }
 
-    it { should be_able_to(:new, DirectMessage) }
-    it { should be_able_to(:create, DirectMessage) }
-    it { should be_able_to(:show, own_direct_message) }
-    it { should_not be_able_to(:show, create(:direct_message)) }
+      context "without geozone" do
+        before(:each) { user.geozone = nil }
+
+        it { should_not be_able_to(:answer, poll_question_from_own_geozone)   }
+        it { should     be_able_to(:answer, poll_question_from_all_geozones)  }
+        it { should_not be_able_to(:answer, poll_question_from_other_geozone) }
+
+        it { should_not be_able_to(:answer, expired_poll_question_from_own_geozone)   }
+        it { should_not be_able_to(:answer, expired_poll_question_from_all_geozones)  }
+        it { should_not be_able_to(:answer, expired_poll_question_from_other_geozone) }
+
+        it { should_not be_able_to(:answer, incoming_poll_question_from_own_geozone)   }
+        it { should_not be_able_to(:answer, incoming_poll_question_from_all_geozones)  }
+        it { should_not be_able_to(:answer, incoming_poll_question_from_other_geozone) }
+      end
+    end
+
+    describe "Budgets" do
+      it { should be_able_to(:create, investment_in_accepting_budget) }
+      it { should_not be_able_to(:create, investment_in_selecting_budget) }
+      it { should_not be_able_to(:create, investment_in_balloting_budget) }
+
+      it { should_not be_able_to(:vote, investment_in_accepting_budget) }
+      it { should be_able_to(:vote, investment_in_selecting_budget) }
+      it { should_not be_able_to(:vote, investment_in_balloting_budget) }
+      
+      it { should_not be_able_to(:destroy, investment_in_accepting_budget) }
+      it { should_not be_able_to(:destroy, investment_in_reviewing_budget) }
+      it { should_not be_able_to(:destroy, investment_in_selecting_budget) }
+      it { should_not be_able_to(:destroy, investment_in_balloting_budget) }
+
+      it { should be_able_to(:destroy, own_investment_in_accepting_budget) }
+      it { should be_able_to(:destroy, own_investment_in_reviewing_budget) }
+      it { should_not be_able_to(:destroy, own_investment_in_selecting_budget) }
+      it { should_not be_able_to(:destroy, investment_in_balloting_budget) }
+
+      it { should_not be_able_to(:create, ballot_in_accepting_budget) }
+      it { should_not be_able_to(:create, ballot_in_selecting_budget) }
+      it { should be_able_to(:create, ballot_in_balloting_budget) }
+    end
   end
 
   describe "when level 3 verified" do
@@ -148,16 +219,47 @@ describe "Abilities::Common" do
     let(:own_direct_message) { create(:direct_message, sender: user) }
     before{ user.update(verified_at: Time.current) }
 
-    it { should be_able_to(:vote, Proposal) }
+    it { should be_able_to(:vote, Proposal)          }
     it { should be_able_to(:vote_featured, Proposal) }
 
-    it { should be_able_to(:create, SpendingProposal) }
+    it { should     be_able_to(:create, SpendingProposal)                }
     it { should_not be_able_to(:destroy, create(:spending_proposal)) }
-    it { should_not be_able_to(:destroy, own_spending_proposal) }
+    it { should_not be_able_to(:destroy, own_spending_proposal)      }
 
-    it { should be_able_to(:new, DirectMessage) }
-    it { should be_able_to(:create, DirectMessage) }
-    it { should be_able_to(:show, own_direct_message) }
+    it { should     be_able_to(:new, DirectMessage)            }
+    it { should     be_able_to(:create, DirectMessage)         }
+    it { should     be_able_to(:show, own_direct_message)      }
     it { should_not be_able_to(:show, create(:direct_message)) }
+
+    it { should     be_able_to(:answer, current_poll)  }
+    it { should_not be_able_to(:answer, expired_poll)  }
+    it { should_not be_able_to(:answer, incoming_poll) }
+
+    it { should     be_able_to(:answer, poll_question_from_own_geozone)   }
+    it { should     be_able_to(:answer, poll_question_from_all_geozones)  }
+    it { should_not be_able_to(:answer, poll_question_from_other_geozone) }
+
+    it { should_not be_able_to(:answer, expired_poll_question_from_own_geozone)   }
+    it { should_not be_able_to(:answer, expired_poll_question_from_all_geozones)  }
+    it { should_not be_able_to(:answer, expired_poll_question_from_other_geozone) }
+
+    it { should_not be_able_to(:answer, incoming_poll_question_from_own_geozone)   }
+    it { should_not be_able_to(:answer, incoming_poll_question_from_all_geozones)  }
+    it { should_not be_able_to(:answer, incoming_poll_question_from_other_geozone) }
+
+    context "without geozone" do
+      before(:each) { user.geozone = nil }
+      it { should_not be_able_to(:answer, poll_question_from_own_geozone)   }
+      it { should     be_able_to(:answer, poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, poll_question_from_other_geozone) }
+
+      it { should_not be_able_to(:answer, expired_poll_question_from_own_geozone)   }
+      it { should_not be_able_to(:answer, expired_poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, expired_poll_question_from_other_geozone) }
+
+      it { should_not be_able_to(:answer, incoming_poll_question_from_own_geozone)   }
+      it { should_not be_able_to(:answer, incoming_poll_question_from_all_geozones)  }
+      it { should_not be_able_to(:answer, incoming_poll_question_from_other_geozone) }
+    end
   end
 end
diff --git a/spec/models/officing/residence_spec.rb b/spec/models/officing/residence_spec.rb
new file mode 100644
index 000000000..dee63b85a
--- /dev/null
+++ b/spec/models/officing/residence_spec.rb
@@ -0,0 +1,121 @@
+require 'rails_helper'
+
+describe Officing::Residence do
+
+  let!(:geozone)  { create(:geozone, census_code: "01") }
+  let(:residence) { build(:officing_residence, document_number: "12345678Z") }
+
+  describe "validations" do
+
+    it "should be valid" do
+      expect(residence).to be_valid
+    end
+
+    it "should not be valid without a document number" do
+      residence.document_number = nil
+      expect(residence).to_not be_valid
+    end
+
+    it "should not be valid without a document type" do
+      residence.document_type = nil
+      expect(residence).to_not be_valid
+    end
+
+    it "should not be valid without a year of birth" do
+      residence.year_of_birth = nil
+      expect(residence).to_not be_valid
+    end
+
+    describe "allowed age" do
+      it "should not be valid if user is under allowed age" do
+        allow_any_instance_of(Officing::Residence).to receive(:date_of_birth).and_return(15.years.ago)
+        expect(residence).to_not be_valid
+        expect(residence.errors[:year_of_birth]).to include("You don't have the required age to participate")
+      end
+
+      it "should be valid if user is above allowed age" do
+        allow_any_instance_of(Officing::Residence).to receive(:date_of_birth).and_return(16.years.ago)
+        expect(residence).to be_valid
+        expect(residence.errors[:year_of_birth]).to be_empty
+      end
+    end
+
+  end
+
+  describe "new" do
+    it "should upcase document number" do
+      residence = Officing::Residence.new({document_number: "x1234567z"})
+      expect(residence.document_number).to eq("X1234567Z")
+    end
+
+    it "should remove all characters except numbers and letters" do
+      residence = Officing::Residence.new({document_number: " 12.345.678 - B"})
+      expect(residence.document_number).to eq("12345678B")
+    end
+  end
+
+  describe "save" do
+
+    it "should store document number, document type, geozone, date of birth and gender" do
+      residence.save
+      user = residence.user
+
+      expect(user.document_number).to eq('12345678Z')
+      expect(user.document_type).to eq("1")
+      expect(user.date_of_birth.year).to eq(1980)
+      expect(user.date_of_birth.month).to eq(12)
+      expect(user.date_of_birth.day).to eq(31)
+      expect(user.gender).to eq('male')
+      expect(user.geozone).to eq(geozone)
+    end
+
+    it "should find existing user and use demographic information" do
+      geozone = create(:geozone)
+      create(:user, document_number: "12345678Z",
+                    document_type: "1",
+                    date_of_birth: Date.new(1981, 11, 30),
+                    gender: 'female',
+                    geozone: geozone)
+
+      residence = build(:officing_residence,
+                        document_number: "12345678Z",
+                        document_type: "1")
+
+      residence.save
+      user = residence.user
+
+      expect(user.document_number).to eq('12345678Z')
+      expect(user.document_type).to eq("1")
+      expect(user.date_of_birth.year).to eq(1981)
+      expect(user.date_of_birth.month).to eq(11)
+      expect(user.date_of_birth.day).to eq(30)
+      expect(user.gender).to eq('female')
+      expect(user.geozone).to eq(geozone)
+    end
+
+    it "makes half-verified users fully verified" do
+      user = create(:user, residence_verified_at: Time.current, document_type: "1", document_number: "12345678Z")
+      expect(user).to be_unverified
+      residence = build(:officing_residence, document_number: "12345678Z", year_of_birth: 1980)
+      expect(residence).to be_valid
+      expect(user.reload).to be_unverified
+      residence.save
+      expect(user.reload).to be_level_three_verified
+    end
+
+    it "stores failed census calls" do
+      residence = build(:officing_residence, :invalid, document_number: "12345678Z")
+      residence.save
+
+      expect(FailedCensusCall.count).to eq(1)
+      expect(FailedCensusCall.first).to have_attributes({
+        user_id:         residence.user.id,
+        poll_officer_id: residence.officer.id,
+        document_number: "12345678Z",
+        document_type:   "1",
+        year_of_birth:   Time.current.year
+      })
+    end
+
+  end
+end
diff --git a/spec/models/poll/answer_spec.rb b/spec/models/poll/answer_spec.rb
new file mode 100644
index 000000000..10ccafbb6
--- /dev/null
+++ b/spec/models/poll/answer_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+describe Poll::Answer do
+
+  describe "validations" do
+    it "validates that the answers are included in the Poll::Question's list" do
+      q = create(:poll_question, valid_answers: 'One, Two, Three')
+      expect(build(:poll_answer, question: q, answer: 'One')).to be_valid
+      expect(build(:poll_answer, question: q, answer: 'Two')).to be_valid
+      expect(build(:poll_answer, question: q, answer: 'Three')).to be_valid
+
+      expect(build(:poll_answer, question: q, answer: 'Four')).to_not be_valid
+    end
+  end
+
+  describe "#record_voter_participation" do
+    it "creates a poll_voter with user and poll data" do
+      answer = create(:poll_answer)
+      expect(answer.poll.voters).to be_blank
+
+      answer.record_voter_participation
+      expect(answer.poll.reload.voters.size).to eq(1)
+      voter = answer.poll.voters.first
+
+      expect(voter.document_number).to eq(answer.author.document_number)
+      expect(voter.poll_id).to eq(answer.poll.id)
+    end
+  end
+
+end
diff --git a/spec/models/poll/booth_spec.rb b/spec/models/poll/booth_spec.rb
new file mode 100644
index 000000000..c095c62cd
--- /dev/null
+++ b/spec/models/poll/booth_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe :booth do
+
+  let(:booth) { build(:poll_booth) }
+
+  it "should be valid" do
+    expect(booth).to be_valid
+  end
+
+  it "should not be valid without a name" do
+    booth.name = nil
+    expect(booth).to_not be_valid
+  end
+
+  describe "#search" do
+    it "should find booths searching by name or location" do
+      booth1 = create(:poll_booth, name: "Booth number 1", location: "City center")
+      booth2 = create(:poll_booth, name: "Central", location: "Town hall")
+
+      expect(Poll::Booth.search("number")).to eq([booth1])
+      expect(Poll::Booth.search("hall")).to eq([booth2])
+      expect(Poll::Booth.search("cen").size).to eq 2
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/poll/final_recount_spec.rb b/spec/models/poll/final_recount_spec.rb
new file mode 100644
index 000000000..bccd772ca
--- /dev/null
+++ b/spec/models/poll/final_recount_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+describe :final_recount do
+
+  it "should update count_log if count changes" do
+    final_recount = create(:poll_final_recount, count: 33)
+
+    expect(final_recount.count_log).to eq("")
+
+    final_recount.count = 33
+    final_recount.save
+    final_recount.count = 32
+    final_recount.save
+    final_recount.count = 34
+    final_recount.save
+
+    expect(final_recount.count_log).to eq(":33:32")
+  end
+
+  it "should update officer_assignment_id_log if count changes" do
+    final_recount = create(:poll_final_recount, count: 33)
+
+    expect(final_recount.count_log).to eq("")
+
+    final_recount.count = 33
+    final_recount.officer_assignment = create(:poll_officer_assignment, id: 111)
+    final_recount.save
+
+    final_recount.count = 32
+    final_recount.officer_assignment = create(:poll_officer_assignment, id: 112)
+    final_recount.save
+
+    final_recount.count = 34
+    final_recount.officer_assignment = create(:poll_officer_assignment, id: 113)
+    final_recount.save
+
+    expect(final_recount.officer_assignment_id_log).to eq(":111:112")
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/poll/null_result_spec.rb b/spec/models/poll/null_result_spec.rb
new file mode 100644
index 000000000..746b48377
--- /dev/null
+++ b/spec/models/poll/null_result_spec.rb
@@ -0,0 +1,70 @@
+require 'rails_helper'
+
+describe Poll::NullResult do
+
+  describe "logging changes" do
+    it "should update amount_log if amount changes" do
+      null_result = create(:poll_null_result, amount: 33)
+
+      expect(null_result.amount_log).to eq("")
+
+      null_result.amount = 33
+      null_result.save
+      null_result.amount = 32
+      null_result.save
+      null_result.amount = 34
+      null_result.save
+
+      expect(null_result.amount_log).to eq(":33:32")
+    end
+
+    it "should update officer_assignment_id_log if amount changes" do
+      null_result = create(:poll_null_result, amount: 33)
+
+      expect(null_result.amount_log).to eq("")
+      expect(null_result.officer_assignment_id_log).to eq("")
+
+      null_result.amount = 33
+      null_result.officer_assignment = create(:poll_officer_assignment, id: 101)
+      null_result.save
+
+      null_result.amount = 32
+      null_result.officer_assignment = create(:poll_officer_assignment, id: 102)
+      null_result.save
+
+      null_result.amount = 34
+      null_result.officer_assignment = create(:poll_officer_assignment, id: 103)
+      null_result.save
+
+      expect(null_result.amount_log).to eq(":33:32")
+      expect(null_result.officer_assignment_id_log).to eq(":101:102")
+    end
+
+    it "should update author_id if amount changes" do
+      null_result = create(:poll_null_result, amount: 33)
+
+      expect(null_result.amount_log).to eq("")
+      expect(null_result.author_id_log).to eq("")
+
+      author_A = create(:poll_officer).user
+      author_B = create(:poll_officer).user
+      author_C = create(:poll_officer).user
+
+      null_result.amount = 33
+      null_result.author_id = author_A.id
+      null_result.save!
+
+      null_result.amount = 32
+      null_result.author_id = author_B.id
+      null_result.save!
+
+      null_result.amount = 34
+      null_result.author_id = author_C.id
+      null_result.save!
+
+      expect(null_result.amount_log).to eq(":33:32")
+      expect(null_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/poll/officer_assignment_spec.rb b/spec/models/poll/officer_assignment_spec.rb
new file mode 100644
index 000000000..b6bce5481
--- /dev/null
+++ b/spec/models/poll/officer_assignment_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+describe :officer_assignment do
+  it "should log user data on creation" do
+    user = create(:user, username: "Larry Bird", email: "larry@lege.nd")
+    officer = create(:poll_officer, user: user)
+
+    oa = create(:poll_officer_assignment, officer: officer)
+
+    expect(oa.reload.user_data_log).to eq "#{user.id} - Larry Bird (larry@lege.nd)"
+  end
+end
\ No newline at end of file
diff --git a/spec/models/poll/officer_spec.rb b/spec/models/poll/officer_spec.rb
new file mode 100644
index 000000000..83bdbecc2
--- /dev/null
+++ b/spec/models/poll/officer_spec.rb
@@ -0,0 +1,124 @@
+require 'rails_helper'
+
+describe :officer do
+
+  describe "#voting_days_assigned_polls" do
+    it "should return all polls with this officer assigned during voting days" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll)
+      poll_2 = create(:poll)
+      poll_3 = create(:poll)
+
+      booth_assignment_1a = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_1b = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_2  = create(:poll_booth_assignment, poll: poll_2)
+
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1a, officer: officer, date: poll_1.starts_at)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1b, officer: officer, date: poll_1.ends_at)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer)
+
+      assigned_polls = officer.voting_days_assigned_polls
+      expect(assigned_polls.size).to eq 2
+      expect(assigned_polls.include?(poll_1)).to eq(true)
+      expect(assigned_polls.include?(poll_2)).to eq(true)
+      expect(assigned_polls.include?(poll_3)).to eq(false)
+    end
+
+    it "should not return polls with this officer assigned for final recount/results" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll)
+      poll_2 = create(:poll)
+
+      booth_assignment_1 = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_2  = create(:poll_booth_assignment, poll: poll_2)
+
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1, officer: officer, date: poll_1.starts_at)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
+
+      assigned_polls = officer.voting_days_assigned_polls
+      expect(assigned_polls.size).to eq 1
+      expect(assigned_polls.include?(poll_1)).to eq(true)
+      expect(assigned_polls.include?(poll_2)).to eq(false)
+    end
+
+    it "should return polls ordered by end date (desc)" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll, ends_at: 1.day.ago)
+      poll_2 = create(:poll, ends_at: 10.days.from_now)
+      poll_3 = create(:poll, ends_at: 10.day.ago)
+
+      [poll_1, poll_2, poll_3].each do |p|
+        create(:poll_officer_assignment, officer: officer, booth_assignment: create(:poll_booth_assignment, poll: p))
+      end
+
+      assigned_polls = officer.voting_days_assigned_polls
+
+      expect(assigned_polls.first).to eq(poll_2)
+      expect(assigned_polls.second).to eq(poll_1)
+      expect(assigned_polls.last).to eq(poll_3)
+    end
+  end
+
+  describe "#final_days_assigned_polls" do
+    it "should return all polls with this officer assigned for final recount/results" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll)
+      poll_2 = create(:poll)
+      poll_3 = create(:poll)
+
+      booth_assignment_1a = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_1b = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_2  = create(:poll_booth_assignment, poll: poll_2)
+
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1a, officer: officer, date: poll_1.starts_at, final: true)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1b, officer: officer, date: poll_1.ends_at, final: true)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
+
+      assigned_polls = officer.final_days_assigned_polls
+      expect(assigned_polls.size).to eq 2
+      expect(assigned_polls.include?(poll_1)).to eq(true)
+      expect(assigned_polls.include?(poll_2)).to eq(true)
+      expect(assigned_polls.include?(poll_3)).to eq(false)
+    end
+
+    it "should not return polls with this officer assigned for voting days" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll)
+      poll_2 = create(:poll)
+
+      booth_assignment_1 = create(:poll_booth_assignment, poll: poll_1)
+      booth_assignment_2  = create(:poll_booth_assignment, poll: poll_2)
+
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_1, officer: officer, date: poll_1.starts_at)
+      create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer, final: true)
+
+      assigned_polls = officer.final_days_assigned_polls
+      expect(assigned_polls.size).to eq 1
+      expect(assigned_polls.include?(poll_1)).to eq(false)
+      expect(assigned_polls.include?(poll_2)).to eq(true)
+    end
+
+    it "should return polls ordered by end date (desc)" do
+      officer = create(:poll_officer)
+
+      poll_1 = create(:poll, ends_at: 1.day.ago)
+      poll_2 = create(:poll, ends_at: 10.days.from_now)
+      poll_3 = create(:poll, ends_at: 10.day.ago)
+
+      [poll_1, poll_2, poll_3].each do |p|
+        create(:poll_officer_assignment, officer: officer, booth_assignment: create(:poll_booth_assignment, poll: p), final: true)
+      end
+
+      assigned_polls = officer.final_days_assigned_polls
+
+      expect(assigned_polls.first).to eq(poll_2)
+      expect(assigned_polls.second).to eq(poll_1)
+      expect(assigned_polls.last).to eq(poll_3)
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/models/poll/partial_result_spec.rb b/spec/models/poll/partial_result_spec.rb
new file mode 100644
index 000000000..dd6176a06
--- /dev/null
+++ b/spec/models/poll/partial_result_spec.rb
@@ -0,0 +1,81 @@
+require 'rails_helper'
+
+describe Poll::PartialResult do
+
+  describe "validations" do
+    it "validates that the answers are included in the Poll::Question's list" do
+      q = create(:poll_question, valid_answers: 'One, Two, Three')
+      expect(build(:poll_partial_result, question: q, answer: 'One')).to be_valid
+      expect(build(:poll_partial_result, question: q, answer: 'Two')).to be_valid
+      expect(build(:poll_partial_result, question: q, answer: 'Three')).to be_valid
+
+      expect(build(:poll_partial_result, question: q, answer: 'Four')).to_not be_valid
+    end
+  end
+
+  describe "logging changes" do
+    it "should update amount_log if amount changes" do
+      partial_result = create(:poll_partial_result, amount: 33)
+
+      expect(partial_result.amount_log).to eq("")
+
+      partial_result.amount = 33
+      partial_result.save
+      partial_result.amount = 32
+      partial_result.save
+      partial_result.amount = 34
+      partial_result.save
+
+      expect(partial_result.amount_log).to eq(":33:32")
+    end
+
+    it "should update officer_assignment_id_log if amount changes" do
+      partial_result = create(:poll_partial_result, amount: 33)
+
+      expect(partial_result.amount_log).to eq("")
+      expect(partial_result.officer_assignment_id_log).to eq("")
+
+      partial_result.amount = 33
+      partial_result.officer_assignment = create(:poll_officer_assignment, id: 10)
+      partial_result.save
+
+      partial_result.amount = 32
+      partial_result.officer_assignment = create(:poll_officer_assignment, id: 20)
+      partial_result.save
+
+      partial_result.amount = 34
+      partial_result.officer_assignment = create(:poll_officer_assignment, id: 30)
+      partial_result.save
+
+      expect(partial_result.amount_log).to eq(":33:32")
+      expect(partial_result.officer_assignment_id_log).to eq(":10:20")
+    end
+
+    it "should update author_id if amount changes" do
+      partial_result = create(:poll_partial_result, amount: 33)
+
+      expect(partial_result.amount_log).to eq("")
+      expect(partial_result.author_id_log).to eq("")
+
+      author_A = create(:poll_officer).user
+      author_B = create(:poll_officer).user
+      author_C = create(:poll_officer).user
+
+      partial_result.amount = 33
+      partial_result.author_id = author_A.id
+      partial_result.save!
+
+      partial_result.amount = 32
+      partial_result.author_id = author_B.id
+      partial_result.save!
+
+      partial_result.amount = 34
+      partial_result.author_id = author_C.id
+      partial_result.save!
+
+      expect(partial_result.amount_log).to eq(":33:32")
+      expect(partial_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
+    end
+  end
+
+end
diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb
new file mode 100644
index 000000000..80a57e916
--- /dev/null
+++ b/spec/models/poll/poll_spec.rb
@@ -0,0 +1,143 @@
+require 'rails_helper'
+
+describe :poll do
+
+  let(:poll) { build(:poll) }
+
+  describe "validations" do
+    it "should be valid" do
+      expect(poll).to be_valid
+    end
+
+    it "should not be valid without a name" do
+      poll.name = nil
+      expect(poll).to_not be_valid
+    end
+
+    it "should not be valid without a start date" do
+      poll.starts_at = nil
+      expect(poll).to_not be_valid
+    end
+
+    it "should not be valid without an end date" do
+      poll.ends_at = nil
+      expect(poll).to_not be_valid
+    end
+
+    it "should not be valid without a proper start/end date range" do
+      poll.starts_at = 1.week.ago
+      poll.ends_at = 2.months.ago
+      expect(poll).to_not be_valid
+    end
+  end
+
+  describe "#opened?" do
+    it "returns true only when it isn't too early or too late" do
+      expect(create(:poll, :incoming)).to_not be_current
+      expect(create(:poll, :expired)).to_not be_current
+      expect(create(:poll)).to be_current
+    end
+  end
+
+  describe "#incoming?" do
+    it "returns true only when it is too early" do
+      expect(create(:poll, :incoming)).to be_incoming
+      expect(create(:poll, :expired)).to_not be_incoming
+      expect(create(:poll)).to_not be_incoming
+    end
+  end
+
+  describe "#expired?" do
+    it "returns true only when it is too late" do
+      expect(create(:poll, :incoming)).to_not be_expired
+      expect(create(:poll, :expired)).to be_expired
+      expect(create(:poll)).to_not be_expired
+    end
+  end
+
+  describe "#published?" do
+    it "returns true only when published is true" do
+      expect(create(:poll)).to_not be_published
+      expect(create(:poll, :published)).to be_published
+    end
+  end
+
+  describe "#document_has_voted?" do
+    it "returns true if Poll::Voter with document exists" do
+      poll = create(:poll)
+      voter = create(:poll_voter, :valid_document, poll: poll)
+
+      expect(poll.document_has_voted?(voter.document_number, voter.document_type)).to eq(true)
+    end
+
+    it "returns false if Poll::Voter with document does not exists" do
+      poll_2 = create(:poll)
+      voter = create(:poll_voter, :valid_document, poll: poll_2)
+
+      expect(poll.document_has_voted?(voter.document_number, voter.document_type)).to eq(false)
+    end
+  end
+
+  describe "answerable_by" do
+    let(:geozone) {create(:geozone) }
+
+    let!(:current_poll) { create(:poll) }
+    let!(:expired_poll) { create(:poll, :expired) }
+    let!(:incoming_poll) { create(:poll, :incoming) }
+    let!(:current_restricted_poll) { create(:poll, geozone_restricted: true, geozones: [geozone]) }
+    let!(:expired_restricted_poll) { create(:poll, :expired, geozone_restricted: true, geozones: [geozone]) }
+    let!(:incoming_restricted_poll) { create(:poll, :incoming, geozone_restricted: true, geozones: [geozone]) }
+    let!(:all_polls) { [current_poll, expired_poll, incoming_poll, current_poll, expired_restricted_poll, incoming_restricted_poll] }
+    let(:non_current_polls) { [expired_poll, incoming_poll, expired_restricted_poll, incoming_restricted_poll] }
+
+    let(:non_user) { nil }
+    let(:level1)   { create(:user) }
+    let(:level2)   { create(:user, :level_two) }
+    let(:level2_from_geozone)   { create(:user, :level_two, geozone: geozone) }
+    let(:all_users) { [non_user, level1, level2, level2_from_geozone] }
+
+    describe 'instance method' do
+      it "rejects non-users and level 1 users" do
+        all_polls.each do |poll|
+          expect(poll).to_not be_answerable_by(non_user)
+          expect(poll).to_not be_answerable_by(level1)
+        end
+      end
+
+      it "rejects everyone when not current" do
+        non_current_polls.each do |poll|
+          all_users.each do |user|
+            expect(poll).to_not be_answerable_by(user)
+          end
+        end
+      end
+
+      it "accepts level 2 users when unrestricted and current" do
+        expect(current_poll).to be_answerable_by(level2)
+        expect(current_poll).to be_answerable_by(level2_from_geozone)
+      end
+
+      it "accepts level 2 users only from the same geozone when restricted by geozone" do
+        expect(current_restricted_poll).to_not be_answerable_by(level2)
+        expect(current_restricted_poll).to be_answerable_by(level2_from_geozone)
+      end
+    end
+
+    describe 'class method' do
+      it "returns no polls for non-users and level 1 users" do
+        expect(Poll.answerable_by(nil)).to be_empty
+        expect(Poll.answerable_by(level1)).to be_empty
+      end
+
+      it "returns unrestricted polls for level 2 users" do
+        expect(Poll.answerable_by(level2).to_a).to eq([current_poll])
+      end
+
+      it "returns restricted & unrestricted polls for level 2 users of the correct geozone" do
+        list = Poll.answerable_by(level2_from_geozone)
+                   .order(:geozone_restricted)
+        expect(list.to_a).to eq([current_poll, current_restricted_poll])
+      end
+    end
+  end
+end
diff --git a/spec/models/poll/question_spec.rb b/spec/models/poll/question_spec.rb
new file mode 100644
index 000000000..057dfebca
--- /dev/null
+++ b/spec/models/poll/question_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe Poll::Question, type: :model do
+
+  describe "#valid_answers" do
+    it "gets a comma-separated string, but returns an array" do
+      q = create(:poll_question, valid_answers: "Yes, No")
+      expect(q.valid_answers).to eq(["Yes", "No"])
+    end
+  end
+
+  describe "#copy_attributes_from_proposal" do
+    it "copies the attributes from the proposal" do
+      create_list(:geozone, 3)
+      p = create(:proposal)
+      q = create(:poll_question)
+      q.copy_attributes_from_proposal(p)
+      expect(q.valid_answers).to eq(['Yes', 'No'])
+      expect(q.author).to eq(p.author)
+      expect(q.author_visible_name).to eq(p.author.name)
+      expect(q.proposal_id).to eq(p.id)
+      expect(q.title).to eq(p.title)
+    end
+  end
+
+end
diff --git a/spec/models/poll/recount_spec.rb b/spec/models/poll/recount_spec.rb
new file mode 100644
index 000000000..fb2c80704
--- /dev/null
+++ b/spec/models/poll/recount_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+describe :recount do
+
+  it "should update count_log if count changes" do
+    recount = create(:poll_recount, count: 33)
+
+    expect(recount.count_log).to eq("")
+
+    recount.count = 33
+    recount.save
+    recount.count = 32
+    recount.save
+    recount.count = 34
+    recount.save
+
+    expect(recount.count_log).to eq(":33:32")
+  end
+
+  it "should update officer_assignment_id_log if count changes" do
+    recount = create(:poll_recount, count: 33)
+
+    expect(recount.count_log).to eq("")
+
+    recount.count = 33
+    recount.officer_assignment = create(:poll_officer_assignment, id: 11)
+    recount.save
+
+    recount.count = 32
+    recount.officer_assignment = create(:poll_officer_assignment, id: 12)
+    recount.save
+
+    recount.count = 34
+    recount.officer_assignment = create(:poll_officer_assignment, id: 13)
+    recount.save
+
+    expect(recount.officer_assignment_id_log).to eq(":11:12")
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/poll/voter_spec.rb b/spec/models/poll/voter_spec.rb
new file mode 100644
index 000000000..752ac5bbc
--- /dev/null
+++ b/spec/models/poll/voter_spec.rb
@@ -0,0 +1,114 @@
+require 'rails_helper'
+
+describe :voter do
+
+  let(:poll) { create(:poll) }
+  let(:booth) { create(:poll_booth) }
+  let(:booth_assignment) { create(:poll_booth_assignment, poll: poll, booth: booth) }
+  let(:voter) { create(:poll_voter) }
+
+  describe "validations" do
+
+    it "should be valid" do
+      expect(voter).to be_valid
+    end
+
+    it "should not be valid without a user" do
+      voter.user = nil
+      expect(voter).to_not be_valid
+    end
+
+    it "should not be valid without a poll" do
+      voter.poll = nil
+      expect(voter).to_not be_valid
+    end
+
+    it "should be valid if has not voted" do
+       voter = build(:poll_voter, :valid_document)
+
+       expect(voter).to be_valid
+    end
+
+    it "should not be valid if the user has already voted in the same poll or booth_assignment" do
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll)
+      voter2 =  build(:poll_voter, user: user, poll: poll)
+
+      expect(voter2).to_not be_valid
+      expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
+    end
+
+    it "should not be valid if the user has already voted in the same poll/booth" do
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment)
+      voter2 =  build(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment)
+
+      expect(voter2).to_not be_valid
+      expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
+    end
+
+    it "should not be valid if the user has already voted in different booth in the same poll" do
+      booth_assignment1 = create(:poll_booth_assignment, poll: poll)
+      booth_assignment2 = create(:poll_booth_assignment, poll: poll)
+
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment1)
+      voter2 =  build(:poll_voter, user: user, poll: poll, booth_assignment: booth_assignment2)
+
+      expect(voter2).to_not be_valid
+      expect(voter2.errors.messages[:document_number]).to eq(["User has already voted"])
+    end
+
+    it "should be valid if the user has already voted in the same booth in different poll" do
+      booth_assignment1 = create(:poll_booth_assignment, booth: booth)
+      booth_assignment2 = create(:poll_booth_assignment, booth: booth, poll: poll)
+
+      user = create(:user, :level_two)
+
+      voter1 = create(:poll_voter, user: user, booth_assignment: booth_assignment1)
+      voter2 =  build(:poll_voter, user: user, booth_assignment: booth_assignment2)
+
+      expect(voter2).to be_valid
+    end
+
+    it "should not be valid if the user has voted via web" do
+      answer = create(:poll_answer)
+      answer.record_voter_participation
+
+      voter = build(:poll_voter, poll: answer.question.poll, user: answer.author)
+      expect(voter).to_not be_valid
+      expect(voter.errors.messages[:document_number]).to eq(["User has already voted"])
+    end
+
+  end
+
+  describe "save" do
+
+    it "sets demographic info" do
+      geozone = create(:geozone)
+      user = create(:user,
+                    geozone: geozone,
+                    date_of_birth: 30.years.ago,
+                    gender: "female")
+
+      voter = build(:poll_voter, user: user)
+      voter.save
+
+      expect(voter.geozone).to eq(geozone)
+      expect(voter.age).to eq(30)
+      expect(voter.gender).to eq("female")
+    end
+
+    it "sets user info" do
+      user = create(:user, document_number: "1234A", document_type: "1")
+      voter = build(:poll_voter, user: user)
+      voter.save
+
+      expect(voter.document_number).to eq("1234A")
+      expect(voter.document_type).to eq("1")
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/models/poll/white_result_spec.rb b/spec/models/poll/white_result_spec.rb
new file mode 100644
index 000000000..687c4ebe1
--- /dev/null
+++ b/spec/models/poll/white_result_spec.rb
@@ -0,0 +1,70 @@
+require 'rails_helper'
+
+describe Poll::WhiteResult do
+
+  describe "logging changes" do
+    it "should update amount_log if amount changes" do
+      white_result = create(:poll_white_result, amount: 33)
+
+      expect(white_result.amount_log).to eq("")
+
+      white_result.amount = 33
+      white_result.save
+      white_result.amount = 32
+      white_result.save
+      white_result.amount = 34
+      white_result.save
+
+      expect(white_result.amount_log).to eq(":33:32")
+    end
+
+    it "should update officer_assignment_id_log if amount changes" do
+      white_result = create(:poll_white_result, amount: 33)
+
+      expect(white_result.amount_log).to eq("")
+      expect(white_result.officer_assignment_id_log).to eq("")
+
+      white_result.amount = 33
+      white_result.officer_assignment = create(:poll_officer_assignment, id: 21)
+      white_result.save
+
+      white_result.amount = 32
+      white_result.officer_assignment = create(:poll_officer_assignment, id: 22)
+      white_result.save
+
+      white_result.amount = 34
+      white_result.officer_assignment = create(:poll_officer_assignment, id: 23)
+      white_result.save
+
+      expect(white_result.amount_log).to eq(":33:32")
+      expect(white_result.officer_assignment_id_log).to eq(":21:22")
+    end
+
+    it "should update author_id if amount changes" do
+      white_result = create(:poll_white_result, amount: 33)
+
+      expect(white_result.amount_log).to eq("")
+      expect(white_result.author_id_log).to eq("")
+
+      author_A = create(:poll_officer).user
+      author_B = create(:poll_officer).user
+      author_C = create(:poll_officer).user
+
+      white_result.amount = 33
+      white_result.author_id = author_A.id
+      white_result.save!
+
+      white_result.amount = 32
+      white_result.author_id = author_B.id
+      white_result.save!
+
+      white_result.amount = 34
+      white_result.author_id = author_C.id
+      white_result.save!
+
+      expect(white_result.amount_log).to eq(":33:32")
+      expect(white_result.author_id_log).to eq(":#{author_A.id}:#{author_B.id}")
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ed0bac164..283a01c96 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -65,6 +65,13 @@ describe User do
     end
   end
 
+  describe "#age" do
+    it "is the rounded integer age based on the date_of_birth" do
+      user = create(:user, date_of_birth: 33.years.ago)
+      expect(user.age).to eq(33)
+    end
+  end
+
   describe 'preferences' do
     describe 'email_on_comment' do
       it 'should be false by default' do
@@ -151,6 +158,18 @@ describe User do
     end
   end
 
+  describe "poll_officer?" do
+    it "is false when the user is not a poll officer" do
+      expect(subject.poll_officer?).to be false
+    end
+
+    it "is true when the user is a poll officer" do
+      subject.save
+      create(:poll_officer, user: subject)
+      expect(subject.poll_officer?).to be true
+    end
+  end
+
   describe "organization?" do
     it "is false when the user is not an organization" do
       expect(subject.organization?).to be false
@@ -351,6 +370,20 @@ describe User do
       end
 
     end
+
+    describe "erased" do
+
+      it "returns users that have been erased" do
+        user1 = create(:user, erased_at: Time.current)
+        user2 = create(:user, erased_at: Time.current)
+        user3 = create(:user, erased_at: nil)
+
+        expect(User.erased).to include(user1)
+        expect(User.erased).to include(user2)
+        expect(User.erased).to_not include(user3)
+      end
+
+    end
   end
 
   describe "self.search" do
@@ -469,4 +502,134 @@ describe User do
 
   end
 
+  describe "#take_votes_from" do
+    it "logs info of previous users" do
+      user = create(:user, :level_three)
+      other_user = create(:user, :level_three)
+      another_user = create(:user)
+
+      expect(user.former_users_data_log).to be_blank
+
+      user.take_votes_from other_user
+
+      expect(user.former_users_data_log).to include("id: #{other_user.id}")
+
+      user.take_votes_from another_user
+
+      expect(user.former_users_data_log).to include("id: #{other_user.id}")
+      expect(user.former_users_data_log).to include("| id: #{another_user.id}")
+    end
+
+    it "reassigns votes from other user" do
+      other_user = create(:user, :level_three)
+      user = create(:user, :level_three)
+
+      v1 = create(:vote, voter: other_user, votable: create(:debate))
+      v2 = create(:vote, voter: other_user, votable: create(:proposal))
+      v3 = create(:vote, voter: other_user, votable: create(:comment))
+
+      create(:vote)
+
+      expect(other_user.votes.count).to eq(3)
+      expect(user.votes.count).to eq(0)
+
+      user.take_votes_from other_user
+
+      expect(other_user.votes.count).to eq(0)
+      expect(user.vote_ids.sort).to eq([v1.id, v2.id, v3.id].sort)
+    end
+
+    it "reassigns budget ballots from other user" do
+      other_user = create(:user, :level_three)
+      user = create(:user, :level_three)
+
+      b1 = create(:budget_ballot, user: other_user)
+      b2 = create(:budget_ballot, user: other_user)
+
+      create(:budget_ballot)
+
+      expect(Budget::Ballot.where(user: other_user).count).to eq(2)
+      expect(Budget::Ballot.where(user: user).count).to eq(0)
+
+      user.take_votes_from other_user
+
+      expect(Budget::Ballot.where(user: other_user).count).to eq(0)
+      expect(Budget::Ballot.where(user: user).sort).to eq([b1, b2].sort)
+    end
+
+    it "reassigns poll voters from other user" do
+      other_user = create(:user, :level_three)
+      user = create(:user, :level_three)
+
+      v1 = create(:poll_voter, user: other_user)
+      v2 = create(:poll_voter, user: other_user)
+
+      create(:poll_voter)
+
+      expect(Poll::Voter.where(user: other_user).count).to eq(2)
+      expect(Poll::Voter.where(user: user).count).to eq(0)
+
+      user.take_votes_from other_user
+
+      expect(Poll::Voter.where(user: other_user).count).to eq(0)
+      expect(Poll::Voter.where(user: user).sort).to eq([v1, v2].sort)
+    end
+  end
+
+  describe "#take_votes_if_erased_document" do
+    it "does nothing if no erased user with received document" do
+      user_1 = create(:user, :level_three)
+      user_2 = create(:user, :level_three)
+
+      create(:vote, voter: user_1)
+      create(:budget_ballot, user: user_1)
+      create(:poll_voter, user: user_1)
+
+      user_2.take_votes_if_erased_document(111, 1)
+
+      expect(user_1.votes.count).to eq(1)
+      expect(user_2.votes.count).to eq(0)
+
+      expect(Budget::Ballot.where(user: user_1).count).to eq(1)
+      expect(Budget::Ballot.where(user: user_2).count).to eq(0)
+
+      expect(Poll::Voter.where(user: user_1).count).to eq(1)
+      expect(Poll::Voter.where(user: user_2).count).to eq(0)
+    end
+
+    it "takes votes from erased user with received document" do
+      user_1 = create(:user, :level_two, document_number: "12345777", document_type: "1")
+      user_2 = create(:user)
+
+      create(:vote, voter: user_1)
+      create(:budget_ballot, user: user_1)
+      create(:poll_voter, user: user_1)
+
+      user_1.erase
+
+      user_2.take_votes_if_erased_document("12345777", "1")
+
+      expect(user_1.votes.count).to eq(0)
+      expect(user_2.votes.count).to eq(1)
+
+      expect(Budget::Ballot.where(user: user_1).count).to eq(0)
+      expect(Budget::Ballot.where(user: user_2).count).to eq(1)
+
+      expect(Poll::Voter.where(user: user_1).count).to eq(0)
+      expect(Poll::Voter.where(user: user_2).count).to eq(1)
+    end
+
+    it "removes document from erased user and logs info" do
+      user_1 = create(:user, document_number: "12345777", document_type: "1")
+      user_2 = create(:user)
+      user_1.erase
+
+      user_2.take_votes_if_erased_document("12345777", "1")
+
+      expect(user_2.reload.former_users_data_log).to include("id: #{user_1.id}")
+      expect(user_1.reload.document_number).to be_blank
+    end
+
+  end
+
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a40934d92..97a94bec7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -105,4 +105,9 @@ RSpec.configure do |config|
 end
 
 # Parallel build helper configuration for travis
-Knapsack::Adapters::RSpecAdapter.bind
\ No newline at end of file
+Knapsack::Adapters::RSpecAdapter.bind
+
+options = {js_errors: false}
+Capybara.register_driver :poltergeist_no_js_errors do |app|
+  Capybara::Poltergeist::Driver.new(app, options)
+end
\ No newline at end of file
diff --git a/spec/support/common_actions.rb b/spec/support/common_actions.rb
index 5cd4e748a..e0fdfe425 100644
--- a/spec/support/common_actions.rb
+++ b/spec/support/common_actions.rb
@@ -141,6 +141,16 @@ module CommonActions
     expect(page).to have_content 'Residence verified'
   end
 
+  def officing_verify_residence
+    select 'DNI', from: 'residence_document_type'
+    fill_in 'residence_document_number', with: "12345678Z"
+    fill_in 'residence_year_of_birth', with: "1980"
+
+    click_button 'Validate document'
+
+    expect(page).to have_content 'Document verified with Census'
+  end
+
   def confirm_phone
     fill_in 'sms_phone', with: "611111111"
     click_button 'Send'
@@ -203,7 +213,7 @@ module CommonActions
      create(:debate, :with_confidence_score, cached_votes_up: 80)]
   end
 
-  def create_successfull_proposals
+  def create_successful_proposals
     [create(:proposal, title: "Winter is coming", question: "Do you speak it?", cached_votes_up: Proposal.votes_needed_for_success + 100),
      create(:proposal, title: "Fire and blood", question: "You talking to me?", cached_votes_up: Proposal.votes_needed_for_success + 1)]
   end