WIP on datarank module