[KFSQA-839] Ok, pretty much done. Ready for review, methinks.
[KFSQA-839] Added the @cornell tag.