Worked on the router class some more.