Makes further progress. Adds checkbox.