-Add support for skip, limit and sort
-Convert tabs to spaces
-Comment unimplemented tests