Comments and single template done