Reworked route matching algorithm and refactored everything