Added rank generation with lambda
Merge branch 'james_branch_2' into dev