Implemented where clauses...

...but I still need to change name to have them qualified.