Giving up; moving everything back into routes.h