Updated logger, more routing shit