further work on parser integration