Guessing/answering partially done.

Working on the branch instead of master again. :(