Multi in place
Wrap this up since it is on hold till later. Right now we will focus on the single choice option that is there now.
Merge branch 'feature-multi-os-browser' into development