Worked on organization and scoreboard

Hopefully on the right track, just need to understand implementation
better.