Change names so I can indent one less level
Pull where clauses into own file
Where clause works for bare-strings
wrong directory
where clause tests pass