Changed rank field to an array and adjusted all tests.
Merge branch 'c1moore_branch' into dev