Scoreboards (against master)

This PR is the same as #340, except it's against master.

This merges cleanly, if @SpaceManiac wants it merged into `master` instead of `scoreboards`