Incorporated router.c -- doh!