Refactored router to accept a Request object. Baby steps towards removing use of static methods...