Better QA (closes #5)