Added temporary scoring system
Merge branch 'feature-terry' into dev