Little more routing logic, some authentication logic