Add Question and Match schemas, build out match generation