Feature commit three https://app.asana.com/0/22814065622611/22814065622613 and some other stuff