A lot of changes, lenta parsing and stuff