Continued edit stream recipe.  Added stage and state to commitment and commitment type.