added commenting where needed and status message
https://app.asana.com/0/19128794071859/20811486365150