Starting to update lexer & parser to new Interface based structure. Doesn't compile at the moment though