#24 Fixed up some routing
I've got no clue what I'm committing right now...