diff --git a/src/models/challenge.js b/src/models/challenge.js
index d00e533631..40f2ddd0c9 100644
--- a/src/models/challenge.js
+++ b/src/models/challenge.js
@@ -2,7 +2,7 @@ var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
 var helpers = require('habitrpg-shared/script/helpers');
 var _ = require('lodash');
-var TaskSchema = require('./task').schema;
+var TaskSchemas = require('./task');
 var Group = require('./group').model;
 
 var ChallengeSchema = new Schema({
@@ -10,10 +10,10 @@ var ChallengeSchema = new Schema({
   name: String,
   shortName: String,
   description: String,
-  habits: [TaskSchema],
-  dailys: [TaskSchema],
-  todos: [TaskSchema],
-  rewards: [TaskSchema],
+  habits:   [TaskSchemas.HabitSchema],
+  dailys:   [TaskSchemas.DailySchema],
+  todos:    [TaskSchemas.TodoSchema],
+  rewards:  [TaskSchemas.RewardSchema],
   leader: {type: String, ref: 'User'},
   group: {type: String, ref: 'Group'},
   timestamp: {type: Date, 'default': Date.now},
diff --git a/src/models/task.js b/src/models/task.js
index 5a4f28953a..67d32929e9 100644
--- a/src/models/task.js
+++ b/src/models/task.js
@@ -12,37 +12,78 @@ var _ = require('lodash');
 // Task Schema
 // -----------
 
-var TaskSchema = new Schema({
+var TaskSchema = {
   //_id:{type: String,'default': helpers.uuid},
   id: {type: String,'default': helpers.uuid},
-  history: Array, // [{date:Date, value:Number}], // this causes major performance problems
   text: String,
-  date: String, // due date for todos // FIXME we're getting parse errors, people have stored as "today" and "3/13". Need to run a migration & put this back to type: Date
   notes: {type: String, 'default': ''},
   tags: {type: Schema.Types.Mixed, 'default': {}}, //{ "4ddf03d9-54bd-41a3-b011-ca1f1d2e9371" : true },
-  type: {type:String, 'default': 'habit'}, // habit, daily
-  up: {type: Boolean, 'default': true},
-  down: {type: Boolean, 'default': true},
-  value: {type: Number, 'default': 0},
-  completed: {type: Boolean, 'default': false},
+  value: {type: Number, 'default': 0}, // redness
   priority: {type: String, 'default': '!'}, //'!!' // FIXME this should be a number or something
-  repeat: {type: Schema.Types.Mixed, 'default': {m:1, t:1, w:1, th:1, f:1, s:1, su:1} },
-  streak: {type: Number, 'default': 0},
   challenge: {
     id: {type: 'String', ref:'Challenge'},
     broken: String, // CHALLENGE_DELETED, TASK_DELETED, UNSUBSCRIBED, CHALLENGE_CLOSED
     winner: String // user.profile.name
     // group: {type: 'Strign', ref: 'Group'} // if we restore this, rename `id` above to `challenge`
   }
-},{
-  _id: false
-});
+};
+
+var HabitSchema = new Schema(
+  _.defaults({
+    type: {type:String, 'default': 'habit'},
+    history: Array, // [{date:Date, value:Number}], // this causes major performance problems
+    up: {type: Boolean, 'default': true},
+    down: {type: Boolean, 'default': true}
+  }, TaskSchema)
+  , { _id: false }
+);
+
+var DailySchema = new Schema(
+  _.defaults({
+    type: {type:String, 'default': 'daily'},
+    history: Array,
+    completed: {type: Boolean, 'default': false},
+    repeat: {
+      m:  {type: Boolean, 'default': true},
+      t:  {type: Boolean, 'default': true},
+      w:  {type: Boolean, 'default': true},
+      th: {type: Boolean, 'default': true},
+      f:  {type: Boolean, 'default': true},
+      s:  {type: Boolean, 'default': true},
+      su: {type: Boolean, 'default': true}
+    },
+    streak: {type: Number, 'default': 0}
+  }, TaskSchema)
+  , { _id: false }
+)
+
+var TodoSchema = new Schema(
+  _.defaults({
+    type: {type:String, 'default': 'todo'},
+    completed: {type: Boolean, 'default': false},
+    date: String // due date for todos // FIXME we're getting parse errors, people have stored as "today" and "3/13". Need to run a migration & put this back to type: Date
+  }, TaskSchema)
+  , { _id: false }
+);
+
+var RewardSchema = new Schema(
+  _.defaults({
+    type: {type:String, 'default': 'reward'}
+  }, TaskSchema)
+  , { _id: false }
+);
 
 /**
  * Workaround for bug when _id & id were out of sync, we can remove this after challenges has been running for a while
  */
-TaskSchema.post('init', function(doc){
-  if (!doc.id && doc._id) doc.id = doc._id;
-})
+//_.each([HabitSchema, DailySchema, TodoSchema, RewardSchema], function(schema){
+//  schema.post('init', function(doc){
+//    if (!doc.id && doc._id) doc.id = doc._id;
+//  })
+//})
 
-module.exports.schema = TaskSchema;
\ No newline at end of file
+module.exports.TaskSchema = TaskSchema;
+module.exports.HabitSchema = HabitSchema;
+module.exports.DailySchema = DailySchema;
+module.exports.TodoSchema = TodoSchema;
+module.exports.RewardSchema = RewardSchema;
diff --git a/src/models/user.js b/src/models/user.js
index ccfc2d6538..9b6adc8dc8 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -9,7 +9,7 @@ var Schema = mongoose.Schema;
 var helpers = require('habitrpg-shared/script/helpers');
 var items = require('habitrpg-shared/script/items');
 var _ = require('lodash');
-var TaskSchema = require('./task').schema;
+var TaskSchemas = require('./task');
 var Challenge = require('./challenge').model;
 
 // User Schema
@@ -219,10 +219,10 @@ var UserSchema = new Schema({
 
   challenges: [{type: 'String', ref:'Challenge'}],
 
-  habits: [TaskSchema],
-  dailys: [TaskSchema],
-  todos: [TaskSchema],
-  rewards: [TaskSchema],
+  habits:   [TaskSchemas.HabitSchema],
+  dailys:   [TaskSchemas.DailySchema],
+  todos:    [TaskSchemas.TodoSchema],
+  rewards:  [TaskSchemas.RewardSchema],
 
 }, {
   strict: true,