Solved routes problems
Almost finished