Using our Router, TODO: reqrite tests