Currently working on the map, the re-ranking thing is broken though