Rewrote routes. Befores now actually work