I'm not sure if you still need any help or not as it sounds like you have everything under control. However, in the event you have more questions there is a tech article on YotaTech.com that might help you. Go
here to view the article. There is one photo in particular that will probably help you with switch questions. See below.
