re-align some templates with kraman's, re-organize into multiple plays with tags