moved everything to scoreboards, might be a bug or two outstanding.