Idiomacy pass

@andymoe, in progress checkpoint.

Will merge and continue on +1.