Add a new (still unstable) router system