Cleaned for merging
Begin work on total score.

I need to increment better!