Filled out remaining methods in Router