Cleanup..

Finally Having a good structor.  Scoreboard now generally available