Further rework during review
Moar changes
Trimmer structural change