BNF scaffolding
Fixed Makefile