This introduces a new file for clarity. Options handling changes so that --tab changes the tab if the window is already opened. Other options are only used at start time.