moved a lot of stuff around, refactored rank and moved to model, messed with tests