More work on the ScoreboardHandler, most functions should be there now