Progress on router