Added router stuff, I hope no one is watching