added the start of router support