Replace with new router (discussion)

Oh, such a nice number, #1800!