Working towards fixing some routing issues.