New route. Probably not faster, just wanted to make it work. much room for improvement.