diff --git a/functions/index.js b/functions/index.js
index 8dfff8c..07f2854 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -167,6 +167,14 @@ exports.createProgress = functions.https.onCall((data, context) => {
 		throw new functions.https.HttpsError("invalid-argument", "switch_language must be a boolean");
 	}
 
+	if (typeof data.ignoreCaps !== "boolean") {
+		throw new functions.https.HttpsError("invalid-argument", "ignoreCaps must be a boolean");
+	}
+
+	if (typeof data.showNumberOfAnswers !== "boolean") {
+		throw new functions.https.HttpsError("invalid-argument", "showNumberOfAnswers must be a boolean");
+	}
+
 	if (data.mode !== "questions" && data.mode !== "lives") {
 		throw new functions.https.HttpsError("invalid-argument", "mode must be \"questions\" or \"lives\"");
 	}
@@ -239,6 +247,7 @@ exports.createProgress = functions.https.onCall((data, context) => {
 			set_titles: setIds.map((setId) => setTitlesDict[setId]),
 			typo: false,
 			ignoreCaps: data.ignoreCaps,
+			showNumberOfAnswers: data.showNumberOfAnswers,
 		}
 
 		return {
@@ -263,10 +272,12 @@ exports.createProgress = functions.https.onCall((data, context) => {
 			const terms = {
 				"item": doc.data().term,
 				"sound": doc.data().sound,
+				"numberOfAnswers": doc.data().definition.split("/").length,
 			};
 			const definitions = {
 				"item": doc.data().definition,
 				"sound": doc.data().sound,
+				"numberOfAnswers": doc.data().term.split("/").length,
 			};
 
 			data.dataToSet.questions.push(vocabId);
@@ -345,6 +356,8 @@ exports.createProgressWithIncorrect = functions.https.onCall((data, context) =>
 					typo: false,
 					setIds: progressData.setIds,
 					set_titles: progressData.set_titles,
+					ignoreCaps: progressData.ignoreCaps,
+					showNumberOfAnswers: progressData.showNumberOfAnswers,
 				};
 				if (progressData.mode === "lives") {
 					dataToSet.lives = progressData.start_lives;
@@ -607,6 +620,7 @@ exports.processAnswer = functions.https.onCall((data, context) => {
 					totalCorrect: docData.correct.length,
 					totalIncorrect: docData.incorrect.length,
 					typo: false,
+					numberOfAnswers: progressDoc.data().showNumberOfAnswers === true ? 0 : null,
 				}
 
 				docData.typo = false;
@@ -747,6 +761,7 @@ exports.processAnswer = functions.https.onCall((data, context) => {
 									sound: sound,
 									set_owner: nextSetOwner,
 								}
+								returnData.numberOfAnswers = promptDoc.data().numberOfAnswers;
 								transaction.set(progressDocId, docData);
 								return returnData;
 							});
@@ -771,7 +786,8 @@ exports.processAnswer = functions.https.onCall((data, context) => {
 									item: promptDoc.data().item,
 									sound: sound,
 									set_owner: nextSetOwner,
-								}
+								};
+								returnData.numberOfAnswers = promptDoc.data().numberOfAnswers;
 								transaction.set(progressDocId, docData);
 								return returnData;
 							});
diff --git a/src/ClassicTestStart.js b/src/ClassicTestStart.js
index f67b3df..4b4221d 100644
--- a/src/ClassicTestStart.js
+++ b/src/ClassicTestStart.js
@@ -70,6 +70,14 @@ export default function ClassicTestStart(props) {
 						/>
 						<span>Ignore capitals</span>
 					</label>
+					<label>
+						<Checkbox
+							checked={props.showNumberOfAnswers}
+							onChange={props.handleShowNumberOfAnswersChange}
+							inputProps={{ 'aria-label': 'checkbox' }}
+						/>
+						<span>Show number of answers</span>
+					</label>
 				</div>
 
 				<Button
diff --git a/src/LivesTestStart.js b/src/LivesTestStart.js
index f83d933..d09c762 100644
--- a/src/LivesTestStart.js
+++ b/src/LivesTestStart.js
@@ -70,6 +70,14 @@ export default function LivesTestStart(props) {
 						/>
 						<span>Ignore capitals</span>
 					</label>
+					<label>
+						<Checkbox
+							checked={props.showNumberOfAnswers}
+							onChange={props.handleShowNumberOfAnswersChange}
+							inputProps={{ 'aria-label': 'checkbox' }}
+						/>
+						<span>Show number of answers</span>
+					</label>
 				</div>
 
 				<Button
diff --git a/src/LoggedInHome.js b/src/LoggedInHome.js
index 3799358..0a0e500 100644
--- a/src/LoggedInHome.js
+++ b/src/LoggedInHome.js
@@ -72,6 +72,7 @@ export default withRouter(class LoggedInHome extends React.Component {
 			sliderValue: 1,
 			switchLanguage: false,
 			ignoreCaps: false,
+			showNumberOfAnswers: false,
 			totalTestQuestions: 1,
 			pendingDeletions: {},
 		};
@@ -200,6 +201,7 @@ export default withRouter(class LoggedInHome extends React.Component {
 				mode: mode,
 				limit: this.state.sliderValue,
 				ignoreCaps: this.state.ignoreCaps,
+				showNumberOfAnswers: this.state.showNumberOfAnswers,
 			}).then((result) => {
 				const progressId = result.data;
 				this.stopLoading();
@@ -358,6 +360,12 @@ export default withRouter(class LoggedInHome extends React.Component {
 		});
 	}
 
+	handleShowNumberOfAnswersChange = (event) => {
+		this.setState({
+			showNumberOfAnswers: event.target.checked,
+		});
+	}
+
 	render() {
 		return (
 			<div>
@@ -578,8 +586,10 @@ export default withRouter(class LoggedInHome extends React.Component {
 						onSliderChange={this.changeSliderValue}
 						switchLanguage={this.state.switchLanguage}
 						ignoreCaps={this.state.ignoreCaps}
+						showNumberOfAnswers={this.state.showNumberOfAnswers}
 						handleSwitchLanguageChange={this.handleSwitchLanguageChange}
 						handleIgnoreCapsChange={this.handleIgnoreCapsChange}
+						handleShowNumberOfAnswersChange={this.handleShowNumberOfAnswersChange}
 						loading={this.state.loading}
 					/>
 				}
@@ -593,8 +603,10 @@ export default withRouter(class LoggedInHome extends React.Component {
 						onSliderChange={this.changeSliderValue}
 						switchLanguage={this.state.switchLanguage}
 						ignoreCaps={this.state.ignoreCaps}
+						showNumberOfAnswers={this.state.showNumberOfAnswers}
 						handleSwitchLanguageChange={this.handleSwitchLanguageChange}
 						handleIgnoreCapsChange={this.handleIgnoreCapsChange}
+						handleShowNumberOfAnswersChange={this.handleShowNumberOfAnswersChange}
 						loading={this.state.loading}
 					/>
 				}
diff --git a/src/Progress.js b/src/Progress.js
index f720a7b..4e30a4b 100644
--- a/src/Progress.js
+++ b/src/Progress.js
@@ -59,6 +59,7 @@ export default withRouter(class Progress extends React.Component {
 		startTime: null,
 		sound: false,
 		ignoreCaps: false,
+		numberOfAnswers: null,
 	}
 
 	constructor(props) {
@@ -131,6 +132,8 @@ export default withRouter(class Progress extends React.Component {
 				originalTotalQuestions: [...new Set(data.questions)].length,
 				setComplete: data.duration !== null,
 				pageLoaded: true,
+				numberOfAnswers: data.showNumberOfAnswers ? 0 : null,
+				ignoreCaps: data.ignoreCaps,
 			};
 
 			if (data.lives) {
@@ -165,6 +168,7 @@ export default withRouter(class Progress extends React.Component {
 				await nextPromptRef.get().then((doc) => {
 					newState.currentPrompt = doc.data().item;
 					newState.currentSound = doc.data().sound === true;
+					if (newState.numberOfAnswers === 0) newState.numberOfAnswers = doc.data().numberOfAnswers;
 				}).catch((error) => {
 					newState.progressInaccessible = true;
 					console.log(`Progress data inaccessible: ${error}`);
@@ -356,6 +360,7 @@ export default withRouter(class Progress extends React.Component {
 					typo: false,
 					canStartTest: true,
 				};
+				if (this.state.numberOfAnswers !== null && data.numberOfAnswers !== 0) newState.numberOfAnswers = data.numberOfAnswers;
 
 				if (this.state.mode === "lives") newState.lives = data.lives;
 
@@ -555,11 +560,17 @@ export default withRouter(class Progress extends React.Component {
 				limit: this.state.mode === "questions" ? this.state.progress - this.state.incorrect
 					: this.state.mode === "lives" ? this.state.lives
 					: 1,
+				ignoreCaps: this.state.ignoreCaps,
+				showNumberOfAnswers: this.state.numberOfAnswers === null,
 			}).then((result) => {
 				const progressId = result.data;
 				this.stopLoading();
 				this.props.history.push("/progress/" + progressId);
 
+				this.setState({
+					incorrectAnswers: {},
+				});
+
 				this.props.logEvent("restart_test", {
 					progress_id: progressId,
 				});
@@ -579,6 +590,10 @@ export default withRouter(class Progress extends React.Component {
 				this.stopLoading();
 				this.props.history.push("/progress/" + progressId);
 	
+				this.setState({
+					incorrectAnswers: {},
+				});
+	
 				this.props.logEvent("start_test_with_incorrect", {
 					progress_id: progressId,
 				});
@@ -667,6 +682,10 @@ export default withRouter(class Progress extends React.Component {
 													{
 														this.state.moreAnswers
 															?
+													this.state.numberOfAnswers !== null
+													?
+													`${this.state.currentCorrect.length} of ${this.state.numberOfAnswers} correct so far:`
+													:
 															"Correct so far:"
 															:
 															"Answers:"
@@ -677,6 +696,12 @@ export default withRouter(class Progress extends React.Component {
 												)}
 											</>
 											:
+										this.state.numberOfAnswers !== null
+										?
+										<h2>
+										{this.state.currentCorrect.length} of {this.state.numberOfAnswers} correct so far
+										</h2>
+										:
 											""
 									}
 								</div>
@@ -823,6 +848,10 @@ export default withRouter(class Progress extends React.Component {
 												{
 													this.state.moreAnswers
 													?
+													this.state.numberOfAnswers !== null
+													?
+													`${this.state.currentCorrect.length} of ${this.state.numberOfAnswers} correct so far:`
+													:
 													"Correct so far:"
 													:
 													"Answers:"
@@ -833,6 +862,12 @@ export default withRouter(class Progress extends React.Component {
 											)}
 										</>
 										:
+										this.state.numberOfAnswers !== null
+										?
+										<h2>
+										{this.state.currentCorrect.length} of {this.state.numberOfAnswers} correct so far
+										</h2>
+										:
 										""
 									}
 								</div>
diff --git a/src/SetPage.js b/src/SetPage.js
index 22eec94..760b52c 100644
--- a/src/SetPage.js
+++ b/src/SetPage.js
@@ -54,6 +54,7 @@ export default withRouter(class SetPage extends React.Component {
 			sliderValue: 1,
 			switchLanguage: false,
 			ignoreCaps: false,
+			showNumberOfAnswers: false,
 			totalTestQuestions: 1,
 		};
 
@@ -136,6 +137,7 @@ export default withRouter(class SetPage extends React.Component {
 				mode: mode,
 				limit: this.state.sliderValue,
 				ignoreCaps: this.state.ignoreCaps,
+				showNumberOfAnswers: this.state.showNumberOfAnswers,
 			}).then((result) => {
 				const progressId = result.data;
 				this.stopLoading();
@@ -340,6 +342,12 @@ export default withRouter(class SetPage extends React.Component {
 		});
 	}
 
+	handleShowNumberOfAnswersChange = (event) => {
+		this.setState({
+			showNumberOfAnswers: event.target.checked,
+		});
+	}
+
 	render() {
 		return (
 			<div>
@@ -488,8 +496,10 @@ export default withRouter(class SetPage extends React.Component {
 								onSliderChange={this.changeSliderValue}
 								switchLanguage={this.state.switchLanguage}
 								ignoreCaps={this.state.ignoreCaps}
+								showNumberOfAnswers={this.state.showNumberOfAnswers}
 								handleSwitchLanguageChange={this.handleSwitchLanguageChange}
 								handleIgnoreCapsChange={this.handleIgnoreCapsChange}
+								handleShowNumberOfAnswersChange={this.handleShowNumberOfAnswersChange}
 								loading={this.state.loading}
 								disabled={!this.state.canStartTest}
 							/>
@@ -504,8 +514,10 @@ export default withRouter(class SetPage extends React.Component {
 								onSliderChange={this.changeSliderValue}
 								switchLanguage={this.state.switchLanguage}
 								ignoreCaps={this.state.ignoreCaps}
+								showNumberOfAnswers={this.state.showNumberOfAnswers}
 								handleSwitchLanguageChange={this.handleSwitchLanguageChange}
 								handleIgnoreCapsChange={this.handleIgnoreCapsChange}
+								handleShowNumberOfAnswersChange={this.handleShowNumberOfAnswersChange}
 								loading={this.state.loading}
 								disabled={!this.state.canStartTest}
 							/>