I think these last two should actually happen before the status is set to finished?