[KFSQA-839] Ok, pretty much done. Ready for review, methinks.