initial ranking stuff
fixed sortrank vs data pull merge conflict