Overhaul aiming for a more flexible/natural setup
In-progress rev to composition with lex uncertainty