Implemented new ranking calculations, but needs debugging

Committing to transfer between computers