Various new stuff
WIP lookup parsing