More principal.c WIP
Oops, I'd commented out looping over name rules