Finished LONI integration

The parser could be improved. There are a couple of workarounds that are
a bit ugly and make the code messy...