adds if and while functionality
fixes conflict
Full functionality and compilable, limited testing