diff --git a/app/controllers/habits_controller.rb b/app/controllers/habits_controller.rb
index 090c774ded..2e5ff7862e 100644
--- a/app/controllers/habits_controller.rb
+++ b/app/controllers/habits_controller.rb
@@ -18,7 +18,8 @@ class HabitsController < ApplicationController
   # GET /habits/new
   # GET /habits/new.json
   def new
-    @habit = Habit.new(:user_id => current_user.id)
+    @habit = Habit.new
+    @habit.weight = Habit.maximum('weight') + 1
 
     respond_to do |format|
       format.html # new.html.erb
diff --git a/app/views/habits/_form.html.erb b/app/views/habits/_form.html.erb
index a5b4a55b8b..89f0f40fc6 100644
--- a/app/views/habits/_form.html.erb
+++ b/app/views/habits/_form.html.erb
@@ -23,6 +23,14 @@
     <%= f.label :notes %><br />
     <%= f.text_area :notes %>
   </div>
+  <div class="field">
+    <%= f.label :weight %><br />
+    <%= f.text_field :weight %>
+  </div>
+  <div class="field">
+    <%= f.label :tag %><br />
+    <%= f.text_field :tag %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/db/migrate/20120201040610_create_habits.rb b/db/migrate/20120201040610_create_habits.rb
index a958e62cd8..37f671a668 100644
--- a/db/migrate/20120201040610_create_habits.rb
+++ b/db/migrate/20120201040610_create_habits.rb
@@ -9,6 +9,8 @@ class CreateHabits < ActiveRecord::Migration
       t.boolean :down, :default => true
       t.boolean :done, :default => false
       t.text    :notes
+      t.integer :weight, :default => 1
+      t.string  :tag
 
       t.timestamps
     end