Add in a status check and update template accordingly