Refactored task entry to support multiple choice solutions and number entry also