Will/feedback per criterion

@talbs Putting this up before it's ready for review so you can see where I'm changing the templates.