Options Tab completion

Started to add Tab completion for options