Progress on fully implementing Scoreboard