Add ranking

this time merge into master