First commit of the Azz proposal