diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java
index 4b87e9454..4e52c612b 100644
--- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java
+++ b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/MongodbQuery.java
@@ -68,16 +68,19 @@ public class MongodbQuery<K> implements SimpleQuery<MongodbQuery<K>>,
 
     @Override
     public MongodbQuery<K> limit(long limit) {
+        //TODO Add support
         return queryMixin.limit(limit);
     }
 
     @Override
     public MongodbQuery<K> offset(long offset) {
+        //TODO Add support
         return queryMixin.offset(offset);
     }
 
     @Override
     public MongodbQuery<K> restrict(QueryModifiers modifiers) {
+        //TODO Implement this
         return queryMixin.restrict(modifiers);
     }
 
@@ -143,11 +146,13 @@ public class MongodbQuery<K> implements SimpleQuery<MongodbQuery<K>>,
 
     @Override
     public K uniqueResult() {
+        //TODO Do this
         throw new UnsupportedOperationException();
     }
 
     @Override
     public SearchResults<K> listResults() {
+        //TODO Do this
         throw new UnsupportedOperationException();
     }
 
diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java
index db467fb67..6b11eab57 100644
--- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java
+++ b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java
@@ -118,6 +118,10 @@ public class MongodbQueryTest {
         assertEquals(false, i.hasNext());
 
     }
+    //TODO
+    // - test dates
+    // - test with empty values and nulls
+    // - test more complex ands
     
     private void assertQuery(Predicate e, User ... expected) {
         assertQuery(where(e).orderBy(user.lastName.asc(), user.firstName.asc()), expected );