Filled out the ability file to complete #87 and for now close out #42 as well.