Bit of cleanup + comments work, assoc in mongo for now, index in model