Basic functionality working. Preparing to remove Bison & Flex dependencies.