Refactor to a single update loop
Consolodate wiki hits