Progress made on multiple choice; almost there
Merged conflicts
Completed multiple choice creation