Refactoring Q1.1 and 1.2 to use new AbstractQuestion class.