THis is a nice commit that is tough to read

More info
Even more info
and C