Added the full scoring system

Hopefully nothing is broken!