Replaced PEG with jison and redid the basic grammar