Added new scoring mechanism. Testing pending