Need to fix and, or, cases.  Still need to get while, for and return-first implemented