Cleaned up routes, still not working