Scoreboard implementation
Resolved conflicts
Merge remote-tracking branch 'origin/businesslogic' into ui