Finish last commit

The first commit was prematurely commited. This commit finishes answering the first question.