Add server selector (unfinished)