Switched to using jison over pegjs
WIP