Oops, sorry, I left this note but then couldn't find it again to remove it. I added the four way stop, but I'm not sure which or if it should be both? The wiki page didn't really explain what the difference was or why you'd want to use one over the other. I marked the change for review too, so hopefully someone can clear it up?