Initial work on router overhaul