Implemented complete scoring system