Include steven's code + add ParserListeners
Merge with Steven & Gabi.
Hacky but everything kinda works end-to-end.
Merge pull request #14 from emtwo/parser-listeners

End-to-End