So much to do (router fixes)