Moved scoring methods; Build WILL break