Added and experimental router class