Updated router with geometry only options. Working towards #125.