Switching to antlr [WIP]