Sort of working... though routes are still messy