Still working on router issue :(