Added WHERE and ORDER BY functionality

Also updated to do list, and re-worded some comments.
Added to testing.