Demo almost works
Many fixes to query processing, WHEREs work now