refactor to support leaderboards

Signed-off-by: Paul Maréchal marechap.info@gmail.com

To be fair this got a bit out of hands, but it is for the better.