Adding rank - needs work