Some progress on the flex/bison version