diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
index 4de35dc6..d0820a1d 100644
--- a/app/controllers/admin/stats_controller.rb
+++ b/app/controllers/admin/stats_controller.rb
@@ -3,9 +3,8 @@ class Admin::StatsController < ApplicationController
   
   def index
     @registrations = @conference.registrations.includes(:person).order("registrations.created_at ASC")
-
-    @attendees = @conference.registrations.where("attended = ?", true).count
     @registered = @conference.registrations.count
+    @attendees = @conference.registrations.where("attended = ?", true).count
     @pre_registered = @conference.registrations.where("created_at < ?", @conference.start_date).count
     @pre_registered_attended = @conference.registrations.where("created_at < ? AND attended = ?", @conference.start_date, true).count
 
@@ -16,34 +15,118 @@ class Admin::StatsController < ApplicationController
     @handicapped_access_attended = @conference.registrations.where(handicapped_access_required: true)
     @handicapped_access_attended = @handicapped_access_attended.where(attended: true).count
     @suggested_hotel_stay = @conference.registrations.where("using_affiliated_lodging = ?", true).count
+    
+    @events = @conference.events
+#Events charts
+    @machine_states = [['confirmed'], ['cancelled'], ['rejected'], ['withdrawn'], ['new', 'review'], ['unconfirmed', 'accepted']]
+  #Types distribution per state
+    @type_state = {}
+    @machine_states.each do |state|
+      @type_state[state[0]] = var_state_func(@conference.event_types, "event_type", state)
+    end
 
+  #Tracks distribution per state
+    @no_track_all = @events.where(track_id: nil)
+    @no_track_new = @events.where(track_id: nil).where(state: ['new', 'review'])
+    @no_track_unconfirmed = @events.where(track_id: nil).where(state: "unconfirmed")
+    @no_track_confirmed = @events.where(track_id: nil).where(state: "confirmed")
+    @track_state = {}
+    @machine_states.each do |state|
+      @track_state[state[0]] = var_state_func(@conference.tracks, "track", state)
+    end
+
+  #Events_time chart
+    if @events.count > 0
+      start_date = @events.minimum("created_at").strftime("%Y-%m-%d")
+      end_date = @events.maximum("created_at").strftime("%Y-%m-%d")
+      if start_date != nil && end_date != nil
+        @events_time = var_time(start_date, end_date, @events, "created_at")
+      end
+    end
+    
+  #Code for the table in events
+    @mystates = []
+    @mytypes = []
+    @eventstats = {}
+    statelength = 0
+    @totallength = 0
+    #Get totals per state
+    @events.state_machine.states.map.each do |mystate|
+      length = 0
+      events_mystate= @events.where("state" => mystate.name)
+      if events_mystate.count > 0
+        @mystates << mystate
+        events_mystate.each do |myevent|
+          length += myevent.event_type.length
+        end
+        @eventstats["#{mystate.name}"] = {"count" => events_mystate.count, "length" => length}
+      end
+    end
+    
+    @conference.event_types.each do |mytype|
+      events_mytype = @events.where("event_type_id" => mytype.id)
+      if events_mytype.count > 0
+        @mytypes << mytype
+      end
+    end
+    @mytypes.each do |mytype|
+      @mystates.each do |mystate|
+        events_mytype = @events.where("event_type_id" => mytype.id)
+        events_mytype_mystate= events_mytype.where("state" => mystate.name)
+        typelength = 0
+        if events_mytype_mystate.count > 0
+          events_mytype_mystate.each do |myevent|
+            typelength += myevent.event_type.length
+            @totallength += myevent.event_type.length
+          end
+          @eventstats[mytype.title] = {"count" => events_mytype.count, "length" => events_mytype.count * mytype.length} if @eventstats[mytype.title] == nil
+          tmp = {"#{mystate.name}" => {"type_state_count" => events_mytype_mystate.count,  "type_state_length" => typelength}}
+          @eventstats[mytype.title].merge!(tmp)
+        end
+      end
+    end
+    @eventstats["totallength"] = @totallength
+
+#SPEAKERS stats    
     @speakers = Person.joins(:events).where("events.conference_id = ? AND events.state LIKE ?", @conference.id,  'confirmed').uniq
     @speaker_fields_person = %w[name email affiliation]
-    @speaker_fields_reg = %w[other_needs diet arrival departure]
-    
+    @speaker_fields_reg = %w[arrival departure]
+#TICKETS stats    
     @supporter_levels = @conference.supporter_levels
     @tickets = @conference.registrations.joins(:supporter_registration => :supporter_level)
     @tickets = @tickets.where("supporter_levels.title NOT LIKE ? ", "%Free%")
 
-    @mydays = []
-    @mytickets = []
+    @tickets_time = []
 
-    if @conference.registration_start_date and @conference.end_date
-      (@conference.registration_start_date..@conference.end_date).each do |day|
-        day_reg_count = @registrations.where("created_at LIKE '%#{day}%' ").count
-        day_ticket_count = @tickets.where("supporter_registrations.created_at LIKE '%#{day}%' ").count
-        if  day_reg_count != 0
-          @mydays << {"status" => "#{day}", "value" => day_reg_count}
-        end
-        @conference.supporter_levels.each do |level|
-          day_ticket_count = @tickets.where("supporter_registrations.created_at LIKE ? AND supporter_levels.title LIKE ?", "%#{day}%", "%#{level.title}%").count
-          if day_ticket_count !=0
-            @mytickets << {"status" => "#{day}", "ticket" => "#{level}", "value" => day_ticket_count}
-          end
+    if @conference.registration_start_date and @conference.end_date and @registered > 0 and @supporter_levels  
+      start_date = @conference.registration_start_date
+      end_date = @conference.end_date
+      levels = [];
+      @conference.supporter_levels.each do |level|
+        @tickets_time << {"key" => level.title, "values" => []}
+        levels << ["#{level.title}"]
+      end
+
+      (start_date..end_date).each do |day|
+        if @tickets.where("supporter_registrations.created_at LIKE ?", "%#{day}%").where("supporter_levels.title" => levels).count != 0
+          @conference.supporter_levels.each do |level|
+  
+            day_ticket_count = @tickets.where("supporter_registrations.created_at LIKE ? AND supporter_levels.title LIKE ?", "%#{day}%", "%#{level.title}%").count
+          
+            index = @tickets_time.index {|v| v["key"] == "#{level.title}"}
+            @tickets_time[index]["values"] << {"label" => "#{day}", "value" => day_ticket_count}      
+          end  
         end
       end
     end
-    
+    @tickets_distribution = []
+    @tickets_time.each do |ticket|
+      value = ticket["values"].map{|x| x["value"]}.sum
+      percent = (value.to_f / @tickets.count * 100).round(2)
+      @tickets_distribution << {"status" => ticket["key"], "value" => value, "percent" => percent}
+    end
+
+#OTHER_INFO chart / To be 'Questions'
     @other_info = [
       {"status" => "with partner (registered)", "value" => @registered_with_partner}, 
       {"status" => "with partner (attended)", "value" => @attended_with_partner}, 
@@ -52,8 +135,58 @@ class Admin::StatsController < ApplicationController
       {"status" => "stay at suggested hotel", "value" => @suggested_hotel_stay}
     ]
 
+# REGISTRATIONS, registered_time
+    if @conference.registration_start_date and @conference.end_date and @registered > 0
+      start_date = @conference.registration_start_date
+      end_date = @conference.end_date
+      @registered_time = var_time(start_date, end_date, @registrations, "created_at")
+    end
+    
+    respond_to do |format|
+      format.html
+      format.json { render :json => @tickets_time.to_json }
+    end
   end
-
+#FUNCTIONS   
+  def var_time(start_date, end_date, var, field)
+    result = []
+    (start_date..end_date).each do |day|
+      day_var_count = var.where("#{field} LIKE ?", "%#{day}%").count
+      if day_var_count !=0
+	result << {"status" => "#{day}", "value" => day_var_count}
+      end
+    end    
+    return result
+  end
+  
+  def var_state_func(vars, field, mystate)
+    result = []
+    
+    for myvar in vars do
+      #Find events per track and state
+      value = @conference.events.where("#{field}_id" => myvar.id).where(state: mystate).count
+      #Find all events in that state
+      total = @conference.events.where(state: mystate).count
+      status = "#{myvar.name}"
+      
+      if value != 0
+        percent = (value.to_f / total * 100).round(2)
+        result << {"status" => status, "value" => value, "percent" => percent}
+      else
+        percent = 0
+      end
+    end
+    #Get no of events for which the field is not set (Needed so that the pie shows half piece for 50%)
+    sum = result.inject(0) {|sum, hash| sum + hash["value"]}
+    value = total - sum if total and sum
+    if sum !=0 && value !=0
+      percent = (value.to_f / total * 100).round(2)
+      result << {"status" => "no #{field} set", "value" => value, "percent" => percent }
+    end
+    
+    return result
+  end
+  
   def speaker_reg(speaker)
     speaker.registrations.where("conference_id = ? AND person_id = ?", @conference.id, speaker.id).first
   end
@@ -74,4 +207,4 @@ class Admin::StatsController < ApplicationController
   helper_method :speaker_diet
   helper_method :diet_count
   helper_method :social_event_count
-end
+end
\ No newline at end of file
diff --git a/app/models/event_type.rb b/app/models/event_type.rb
index 9bf7d734..5d375084 100644
--- a/app/models/event_type.rb
+++ b/app/models/event_type.rb
@@ -4,4 +4,6 @@ class EventType < ActiveRecord::Base
   belongs_to :conference
 
   validates :length, :numericality => {:greater_than => 0} 
+
+  alias_attribute :name, :title
 end
diff --git a/app/views/admin/stats/_events.html.haml b/app/views/admin/stats/_events.html.haml
new file mode 100644
index 00000000..04c07c4b
--- /dev/null
+++ b/app/views/admin/stats/_events.html.haml
@@ -0,0 +1,41 @@
+-if @events.count > 0
+  %h2{:style => "text-align: center"}
+    = "Events (#{@events.count})"
+  
+  .row-fluid
+    %h3 
+      %u Types per event state
+    - if !@conference.event_types.empty?
+      = render :partial => "events_types"
+    - else
+      %h4
+        %i There are no tracks defined for this conference!
+
+  .row-fluid
+    %h3 
+      %u Tracks per event state
+      - if @no_track_all.count > 0
+        %i= " (#{pluralize(@no_track_all.count, 'event')} not assigned to a track)"
+    - if !@conference.tracks.empty?
+      = render :partial => "events_tracks"
+    - else
+      %h4
+        %i There are no tracks defined for this conference!
+
+  .row-fluid
+    .span12
+      %h3 Proposal Submissions over time
+    .row-fluid
+      .span12#events_time
+    = render :partial => "events_time"
+
+  .row-fluid
+    .span12
+      %br
+      %h3 Overview of all events
+    .row-fluid
+      .span12#events_table
+    = render :partial => "events_table"
+
+- else
+  %h5 There are no submitted events yet.
diff --git a/app/views/admin/stats/_events_table.html.haml b/app/views/admin/stats/_events_table.html.haml
new file mode 100644
index 00000000..0477f18a
--- /dev/null
+++ b/app/views/admin/stats/_events_table.html.haml
@@ -0,0 +1,34 @@
+%table.table.table-bordered.table-striped
+  %thead
+    %th
+    - @mystates.each do |state|
+      %th{:colspan => 2, :style => "text-align:center"}
+        State "#{state.name}"
+    %th{:colspan => 2, :style => "text-align:center"}
+      Total
+      %br
+      No & Time
+
+  %tr
+    %td
+      %b Total
+      - @mystates.each do |mystate|
+        %td
+          %b
+            = @eventstats["#{mystate.name}"]["count"]
+        %td
+          %b
+            #{@eventstats["#{mystate.name}"]["length"] / 60} h #{@eventstats["#{mystate.name}"]["length"] - @eventstats["#{mystate.name}"]["length"] / 60 * 60} m
+      %td
+        %b= @events.count
+      %td
+        %b= show_time(@eventstats["totallength"])
+
+  - @mytypes.each do |mytype|
+    %tr
+      %td= "#{mytype.title} (#{show_time(mytype.length)})"
+      - @mystates.each do |mystate|
+        %td= @eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_count"] unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
+        %td= show_time(@eventstats["#{mytype.title}"]["#{mystate.name}"]["type_state_length"]) unless @eventstats["#{mytype.title}"]["#{mystate.name}"] == nil
+      %td= @eventstats["#{mytype.title}"]["count"]
+      %td= show_time(@eventstats["#{mytype.title}"]["length"])
diff --git a/app/views/admin/stats/_events_time.html b/app/views/admin/stats/_events_time.html
new file mode 100644
index 00000000..25f18d6b
--- /dev/null
+++ b/app/views/admin/stats/_events_time.html
@@ -0,0 +1,71 @@
+<script>
+
+var events = '<%= h @events.count%>';
+var data = <%=raw @events_time.to_json %>;
+
+var valueLabelWidth = 10; // space reserved for value labels (right)
+var barHeight = 24; // height of one bar
+var barLabelWidth = 100; // space reserved for bar labels
+var barLabelPadding = 8; // padding between bar and bar labels (left)
+var gridLabelHeight = 18; // space reserved for gridline labels
+var gridChartOffset = 3; // space between start of grid and first bar
+var maxBarWidth = 420; // width of the bar with the max value
+var color = d3.scale.category20();
+
+// accessor functions 
+var barLabel = function(d) { return d['status']; };
+var barValue = function(d) { return d['value'] / events * 100; };
+var barValues = function(d) { return d['value']; };
+ 
+// scales
+var yScale = d3.scale.ordinal().domain(d3.range(0, data.length)).rangeBands([0, data.length * barHeight]);
+var y = function(d, i) { return yScale(i); };
+var yText = function(d, i) { return y(d, i) + yScale.rangeBand() / 2; };
+var yMax = d3.max(data, function(d){ return barValue(d) + 15; });
+var x = d3.scale.linear().domain([0, yMax]).range([0, maxBarWidth]);
+var width = maxBarWidth + barLabelWidth + valueLabelWidth;
+// svg container element
+var chart = d3.select('#events_time').append("svg")
+  .attr('width', maxBarWidth + barLabelWidth + valueLabelWidth)
+  .attr('height', gridLabelHeight + gridChartOffset + data.length * barHeight);
+
+// bar labels
+var labelsContainer = chart.append('g')
+  .attr('transform', 'translate(' + (barLabelWidth - barLabelPadding) + ',' + (gridLabelHeight + gridChartOffset) + ')'); 
+labelsContainer.selectAll('text').data(data).enter().append('text')
+  .attr('y', yText)
+  .attr('stroke', 'none')
+  .attr('fill', 'black')
+  .attr("dy", ".35em") // vertical-align: middle
+  .attr('text-anchor', 'end')
+  .text(barLabel);
+
+// bars
+var barsContainer = chart.append('g')
+  .attr('transform', 'translate(' + barLabelWidth + ',' + (gridLabelHeight + gridChartOffset) + ')');
+
+barsContainer.selectAll("rect").data(data).enter().append("rect")
+  .attr('y', y)
+  .attr('height', yScale.rangeBand())
+  .attr('width', function(d) { return x(barValue(d)); })
+  .attr('stroke', 'white')
+  .attr('fill', function(d) { return color(barValue(d)); });
+
+// bar value labels
+barsContainer.selectAll("text").data(data).enter().append("text")
+  .attr("x", 5)
+  .attr("y", yText)
+  .attr("dx", 3) // padding-left
+  .attr("dy", ".35em") // vertical-align: middle
+  .attr("text-anchor", "start") // text-align: right
+  .attr("fill", "black")
+  .attr("stroke", "none")
+  .text(function(d) { return d3.round(barValues(d), 2) + " (" + d3.round(barValue(d), 0) + "%)"; });
+// start line
+barsContainer.append("line")
+  .attr("y1", -gridChartOffset)
+  .attr("y2", yScale.rangeExtent()[1] + gridChartOffset)
+  .style("stroke", "#000");
+
+ 
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_tracks.html.haml b/app/views/admin/stats/_events_tracks.html.haml
new file mode 100644
index 00000000..6ecef217
--- /dev/null
+++ b/app/views/admin/stats/_events_tracks.html.haml
@@ -0,0 +1,35 @@
+.row-fluid
+  - if !@track_state['new'].empty?
+    .span4
+      %h4 New Submissions
+      - if @no_track_new.count > 0
+        %h5= "#{pluralize(@no_track_new.count, 'event')} not assigned to a track"
+      - else
+        %h5      
+      .row-fluid
+        .span12#events_tracks_new
+      = render :partial => "events_tracks_new"
+
+  - if !@track_state['unconfirmed'].empty?
+    .span4
+      %h4 Accepted (Unconfirmed)
+      - if @no_track_unconfirmed.count > 0
+        %h5= "#{pluralize(@no_track_unconfirmed.count, 'event')} not assigned to a track"
+      - else
+        %h5 All events assigned to track!
+
+      .row-fluid
+        .span12#events_tracks_unconfirmed
+      = render :partial => "events_tracks_unconfirmed"
+
+  - if !@track_state['confirmed'].empty?
+    .span4
+      %h4 Accepted (Confirmed)
+      - if @no_track_confirmed.count > 0
+        %h5= "#{pluralize(@no_track_confirmed.count, 'event')} not assigned to a track"
+      - else
+        %h5 All events assigned to track!
+
+      .row-fluid
+        .span12#events_tracks_confirmed
+      = render :partial => "events_tracks_confirmed"
diff --git a/app/views/admin/stats/_events_tracks_confirmed.html b/app/views/admin/stats/_events_tracks_confirmed.html
new file mode 100644
index 00000000..d031ed30
--- /dev/null
+++ b/app/views/admin/stats/_events_tracks_confirmed.html
@@ -0,0 +1,79 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.ordinal()
+    .range(["#5254a3", "#6b6ecf", "#9c9ede "]);
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#events_tracks_confirmed").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @track_state['confirmed'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_tracks_confirmed").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_tracks_new.html b/app/views/admin/stats/_events_tracks_new.html
new file mode 100644
index 00000000..d8d4e81c
--- /dev/null
+++ b/app/views/admin/stats/_events_tracks_new.html
@@ -0,0 +1,79 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.ordinal()
+    .range(["#5254a3", "#6b6ecf", "#9c9ede "]);
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#events_tracks_new").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @track_state['new'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_tracks_new").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_tracks_unconfirmed.html b/app/views/admin/stats/_events_tracks_unconfirmed.html
new file mode 100644
index 00000000..1af6b1ad
--- /dev/null
+++ b/app/views/admin/stats/_events_tracks_unconfirmed.html
@@ -0,0 +1,79 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.ordinal()
+    .range(["#5254a3", "#6b6ecf", "#9c9ede "]);
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#events_tracks_unconfirmed").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @track_state['unconfirmed'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_tracks_unconfirmed").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_types.html.haml b/app/views/admin/stats/_events_types.html.haml
new file mode 100644
index 00000000..3d6ac9fd
--- /dev/null
+++ b/app/views/admin/stats/_events_types.html.haml
@@ -0,0 +1,19 @@
+.row-fluid
+  - if !@type_state['new'].empty?
+    .span4
+      %h4 New Submissions: #{@type_state['new'].map{|x| x["value"]}.sum}
+      .row-fluid
+        .span12#events_types_new
+      = render :partial => "events_types_new"
+  - if !@type_state['unconfirmed'].empty?
+    .span4
+      %h4 Accepted (Unconfirmed): #{@type_state['unconfirmed'].map{|x| x["value"]}.sum}
+      .row-fluid
+        .span12#events_types_unconfirmed
+      = render :partial => "events_types_unconfirmed"
+  - if !@type_state['confirmed'].empty?       
+    .span4
+      %h4 Accepted (Confirmed): #{@type_state['confirmed'].map{|x| x["value"]}.sum}
+      .row-fluid
+        .span12#events_types_confirmed
+      = render :partial => "events_types_confirmed"
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_types_confirmed.html b/app/views/admin/stats/_events_types_confirmed.html
new file mode 100644
index 00000000..247e8a14
--- /dev/null
+++ b/app/views/admin/stats/_events_types_confirmed.html
@@ -0,0 +1,78 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.category20();    
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#events_types_confirmed").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @type_state['confirmed'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_types_confirmed").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_types_new.html b/app/views/admin/stats/_events_types_new.html
new file mode 100644
index 00000000..fc560371
--- /dev/null
+++ b/app/views/admin/stats/_events_types_new.html
@@ -0,0 +1,78 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.category20();
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.percent; });
+
+// Where to put the chart
+var svg = d3.select("#events_types_new").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @type_state['new'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_types_new").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_events_types_unconfirmed.html b/app/views/admin/stats/_events_types_unconfirmed.html
new file mode 100644
index 00000000..4335eab0
--- /dev/null
+++ b/app/views/admin/stats/_events_types_unconfirmed.html
@@ -0,0 +1,78 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.category20();
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#events_types_unconfirmed").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @type_state['unconfirmed'].to_json%>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.status; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#events_types_unconfirmed").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius*2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+        .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_registered_time.html b/app/views/admin/stats/_registered_time.html
index fe1ecc48..e3de08e0 100644
--- a/app/views/admin/stats/_registered_time.html
+++ b/app/views/admin/stats/_registered_time.html
@@ -1,7 +1,7 @@
 <script>
 
 var registered = '<%= h @registrations.count%>';
-var data = <%=raw @mydays.to_json %>;
+var data = <%=raw @registered_time.to_json %>;
 
 var valueLabelWidth = 10; // space reserved for value labels (right)
 var barHeight = 24; // height of one bar
diff --git a/app/views/admin/stats/_registrations.html.haml b/app/views/admin/stats/_registrations.html.haml
index f216dbac..161e84cf 100644
--- a/app/views/admin/stats/_registrations.html.haml
+++ b/app/views/admin/stats/_registrations.html.haml
@@ -1,35 +1,42 @@
 .row-fluid
   .span4
-    - if @attendees > 0
-      %h4{:style => "text-indent: 25px"}= "Registrations - Attendees (#{(@attendees.to_f / @registered * 100).round }%)"
+    - if @registered > 0 
+      - if @attendees > 0
+        %h4{:style => "text-indent: 25px"}= "Registrations - Attendees (#{(@attendees.to_f / @registered * 100).round }%)"
+      - else
+        %h4{:style => "text-indent: 25px"}= "Registrations - Attendees"
+      .row-fluid
+        .span12#registrations_attendees
+          = render :partial => "registrations_attendees"
     - else
-      %h4{:style => "text-indent: 25px"}= "Registrations - Attendees"
-    .row-fluid
-      .span12#registrations_attendees
+      %h5 There are no registrations yet.
+
 
   .span4
-    %h4{:style => "text-indent: 10px"}= "Attendance of pre-registered"
-    .row-fluid
-      .span12#registered_attended
+    - if @registered > 0
+      %h4{:style => "text-indent: 10px"}= "Attendance of pre-registered"
+      .row-fluid
+        .span12#registered_attended
+          = render :partial => "registered_attended"
 
   .span4
-    %h4{:style => "text-indent: 25px"}= "% of pre-registered"
-    .row-fluid
-      .span12#preregistered_onsite
+    - if @registered > 0
+      %h4{:style => "text-indent: 25px"}= "% of pre-registered"
+      .row-fluid
+        .span12#preregistered_onsite
+          = render :partial => "preregistered_onsite"
 
 .row-fluid
   .span6
-    %h4= "Other Info"
-    .row-fluid
-      .span12#other_info
+    - if @registered > 0  
+      %h4= "Other Info"
+      .row-fluid
+        .span12#other_info
+          = render :partial => "other_info"
 
   .span6
-    %h4{:style => "text-indent: 98px"}= "Registrations over time"
-    .row-fluid
-      .span12#registered_time
-
-= render :partial => "registered_attended"
-= render :partial => "registered_time"
-= render :partial => "preregistered_onsite"
-= render :partial => "registrations_attendees"
-= render :partial => "other_info"
\ No newline at end of file
+    - if @registered > 0
+      %h4{:style => "text-indent: 98px"}= "Registrations over time"
+      .row-fluid
+        .span12#registered_time
+          = render :partial => "registered_time"           
\ No newline at end of file
diff --git a/app/views/admin/stats/_registrations_attendees.html b/app/views/admin/stats/_registrations_attendees.html
index 57f097e4..89079236 100644
--- a/app/views/admin/stats/_registrations_attendees.html
+++ b/app/views/admin/stats/_registrations_attendees.html
@@ -9,8 +9,8 @@ var registrations = '<%= h @registered %>';
 var attendees = '<%= h @attendees %>';
 
 var data = [
-{"status":"Registrations","value": registrations, "percent": ""},
-{"status":"Attendees","value": attendees, "percent": d3.round(attendees/registrations * 100)+"%"}
+{"status":"Did Not Attend","value": registrations-attendees, "percent": ""},
+{"status":"Attended","value": attendees, "percent": d3.round(attendees/registrations * 100)+"%"}
 ];
 
 var vis = d3.select("#registrations_attendees")
@@ -49,26 +49,7 @@ var arcs = vis.selectAll("g.slice")
     .data(pie)
     .enter()
         .append("svg:g")
-            .attr("class", "slice")
-            .on("mouseover", function(d) {
-                d3.select(this).select("path").transition()
-                    .duration(200)
-                    .attr("d", arcOver)
-                
-                textTop.text(d3.select(this).datum().data.status)
-                    .attr("y", -10);
-                textBottom.text( d3.select(this).datum().data.value)
-                    .attr("y", 10);
-            })
-            .on("mouseout", function(d) {
-                d3.select(this).select("path").transition()
-                    .duration(100)
-                    .attr("d", arc);
-                
-                textTop.text("Registered: " + registrations)
-                    .attr("y", -10);
-                textBottom.text("Attended: " + attendees);
-            });
+            .attr("class", "slice");
 
 arcs.append("svg:path")
     .attr("fill", function(d, i) { return color(i); } )
@@ -92,5 +73,5 @@ legend.append("text")
     .attr("x", 24)
     .attr("y", 9)
     .attr("dy", ".35em")
-    .text(function(d) { return "Total " + d.status; });
+    .text(function(d) { return "Total " + d.status + " (" + d.value + ")"; });
 </script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_tickets.html.haml b/app/views/admin/stats/_tickets.html.haml
index 03c2e99b..f9e25c39 100644
--- a/app/views/admin/stats/_tickets.html.haml
+++ b/app/views/admin/stats/_tickets.html.haml
@@ -1,5 +1,22 @@
-- if @tickets
-  %h2
-    = "Non-Free Tickets(#{@tickets.count})"
-.span4#tickets_time
-= render :partial => "tickets_time"
\ No newline at end of file
+- if @tickets.length > 0
+  .row-fluid
+    .span12
+      %h2
+        = "Non-Free Tickets (#{@tickets.count})"
+  .row-fluid
+    .span4
+      %h4 Ticket distribution
+      .row-fluid
+        .span12#tickets_distribution
+          = render :partial => "tickets_distribution"      
+  .row-fluid
+    .span10
+      %h4 Ticket sales over time
+      .row-fluid
+        .span12#tickets_time
+          = render :partial => "tickets_time"
+- else
+  - if @conference.use_supporter_levels
+    %h5 No tickets have been bought yet.
+  - else
+    %h5 There are no tickets set for this conference.
\ No newline at end of file
diff --git a/app/views/admin/stats/_tickets_distribution.html b/app/views/admin/stats/_tickets_distribution.html
new file mode 100644
index 00000000..b12163d1
--- /dev/null
+++ b/app/views/admin/stats/_tickets_distribution.html
@@ -0,0 +1,79 @@
+<style>
+
+.arc path {
+  stroke: #fff;
+}
+
+</style>
+
+<script>
+
+var width = 250,
+    height = 250,
+    radius = Math.min(width, height) / 2;
+
+var color = d3.scale.ordinal()
+    .range(["#9ECAE1", "#6baed6", "#DEEBF7"]);
+
+var arc = d3.svg.arc()
+    .outerRadius(radius - 10)
+    .innerRadius(0);
+
+var pie = d3.layout.pie()
+    .sort(null)
+    .value(function(d) { return d.value; });
+
+// Where to put the chart
+var svg = d3.select("#tickets_distribution").append("svg")
+    .attr("width", width)
+    .attr("height", height)
+  .append("g")
+    .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+var data = <%=raw @tickets_distribution.to_json %>;
+
+var g = svg.selectAll(".arc")
+    .data(pie(data))
+  .enter().append("g")
+    .attr("class", "arc");
+
+g.append("path")
+    .attr("d", arc)
+    .style("fill", function(d) { return color(d.data.status); });
+
+// Put text inside every piece of the pie-chart
+g.append("text")
+    .attr("transform", function(d) { return "translate(" + arc.centroid(d) + ")"; })
+    .attr("dy", ".35em")
+    .style("text-anchor", "middle")
+    .text(function(d) { return d.data.percent +"%"; });
+
+// Title of chart
+svg.append("text")
+    .attr("class", "title")
+    .attr("x", radius)
+    .attr("y", -radius+10)
+    .text("% of pre-registered");
+
+// Create & position legend
+var legend = d3.select("#tickets_distribution").append("svg")
+    .attr("class", "legend")
+    .attr("width", radius * 2)
+    .attr("height", radius)
+  .selectAll("g")
+    .data(color.domain().slice().reverse())
+  .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(0," + i * 20 + ")"; });
+
+legend.append("rect")
+    .attr("width", 18)
+    .attr("height", 18)
+    .style("fill", color);
+
+legend.append("text")
+    .attr("x", 24)
+    .attr("y", 9)
+    .attr("dy", ".15em")
+    .text(function(d) { return d + " (" + data.filter(function(v){return v.status === d;})[0].value + " or " + data.filter(function(v){return v.status === d;})[0].percent + "%)" ; });
+
+</script>
\ No newline at end of file
diff --git a/app/views/admin/stats/_tickets_time.html b/app/views/admin/stats/_tickets_time.html
index a984443b..6e0b8d44 100644
--- a/app/views/admin/stats/_tickets_time.html
+++ b/app/views/admin/stats/_tickets_time.html
@@ -1,86 +1 @@
-<script>
-
-var registered = '<%= h @registrations.count%>';
-var data = <%=raw @mytickets.to_json %>;
-
-var valueLabelWidth = 40; // space reserved for value labels (right)
-var barHeight = 24; // height of one bar
-var barLabelWidth = 100; // space reserved for bar labels
-var barLabelPadding = 8; // padding between bar and bar labels (left)
-var gridLabelHeight = 18; // space reserved for gridline labels
-var gridChartOffset = 3; // space between start of grid and first bar
-var maxBarWidth = 420; // width of the bar with the max value
- 
-// accessor functions 
-var barLabel = function(d) { return d['status']; };
-var barValue = function(d) { return d['value'] / registered * 100; };
-var barValues = function(d) { return d['value']; };
- 
-// scales
-var yScale = d3.scale.ordinal().domain(d3.range(0, data.length)).rangeBands([0, data.length * barHeight]);
-var y = function(d, i) { return yScale(i); };
-var yText = function(d, i) { return y(d, i) + yScale.rangeBand() / 2; };
-var x = d3.scale.linear().domain([0, 100]).range([0, maxBarWidth]);
-
-// svg container element
-var chart = d3.select('#tickets_time').append("svg")
-  .attr('width', maxBarWidth + barLabelWidth + valueLabelWidth)
-  .attr('height', gridLabelHeight + gridChartOffset + data.length * barHeight);
-/*
-// grid line labels
-var gridContainer = chart.append('g')
-  .attr('transform', 'translate(' + barLabelWidth + ',' + gridLabelHeight + ')'); 
-gridContainer.selectAll("text").data(x.ticks(10)).enter().append("text")
-  .attr("x", x)
-  .attr("dy", -3)
-  .attr("text-anchor", "middle")
-  .text(String);
-
-// vertical grid lines
-gridContainer.selectAll("line").data(x.ticks(10)).enter().append("line")
-  .attr("x1", x)
-  .attr("x2", x)
-  .attr("y1", 0)
-  .attr("y2", yScale.rangeExtent()[1] + gridChartOffset)
-  .style("stroke", "#ccc");*/
-
-// bar labels
-var labelsContainer = chart.append('g')
-  .attr('transform', 'translate(' + (barLabelWidth - barLabelPadding) + ',' + (gridLabelHeight + gridChartOffset) + ')'); 
-labelsContainer.selectAll('text').data(data).enter().append('text')
-  .attr('y', yText)
-  .attr('stroke', 'none')
-  .attr('fill', 'black')
-  .attr("dy", ".35em") // vertical-align: middle
-  .attr('text-anchor', 'end')
-  .text(barLabel);
-
-// bars
-var barsContainer = chart.append('g')
-  .attr('transform', 'translate(' + barLabelWidth + ',' + (gridLabelHeight + gridChartOffset) + ')');
-
-barsContainer.selectAll("rect").data(data).enter().append("rect")
-  .attr('y', y)
-  .attr('height', yScale.rangeBand())
-  .attr('width', function(d) { return x(barValue(d)); })
-  .attr('stroke', 'white')
-  .attr('fill', 'steelblue');
-
-// bar value labels
-barsContainer.selectAll("text").data(data).enter().append("text")
-  .attr("x", function(d) { return x(barValue(d)); })
-  .attr("y", yText)
-  .attr("dx", 3) // padding-left
-  .attr("dy", ".35em") // vertical-align: middle
-  .attr("text-anchor", "start") // text-align: right
-  .attr("fill", "black")
-  .attr("stroke", "none")
-  .text(function(d) { return d3.round(barValues(d), 2) + " registrations (" + d3.round(barValue(d), 0) + "%)"; });
-// start line
-barsContainer.append("line")
-  .attr("y1", -gridChartOffset)
-  .attr("y2", yScale.rangeExtent()[1] + gridChartOffset)
-  .style("stroke", "#000");
-
- 
-</script>
\ No newline at end of file
+(Not yet implemented)
\ No newline at end of file
diff --git a/app/views/admin/stats/index.html.haml b/app/views/admin/stats/index.html.haml
index b001a953..4d56d86f 100644
--- a/app/views/admin/stats/index.html.haml
+++ b/app/views/admin/stats/index.html.haml
@@ -3,6 +3,8 @@
     %ul.nav.nav-tabs#myTab
       %li.active
         %a{:href=>"#registrations", "data-toggle"=>"tab"} Registrations
+      %li
+        %a{:href=>"#events", "data-toggle"=>"tab"} Events       
       %li
         %a{:href=>"#speakers", "data-toggle"=>"tab"} Speakers
       %li
@@ -11,6 +13,8 @@
     .tab-content
       .tab-pane.active#registrations
         = render :partial => 'registrations'
+      .tab-pane#events
+        = render :partial => 'events'
       .tab-pane#speakers
         = render :partial => 'speakers'
       .tab-pane#tickets