make works. Now fix bugs and AST