diff --git a/ui/src/components/CompletePrompt.tsx b/ui/src/components/CompletePrompt.tsx
index ecb2ba1..deb4e04 100644
--- a/ui/src/components/CompletePrompt.tsx
+++ b/ui/src/components/CompletePrompt.tsx
@@ -5,13 +5,15 @@ import { keyDispatcher } from "./TerminalInput";
 type Props<T> = {
     value: string,
     show: boolean,
-    getData: () => Promise<T[]>,
+    keys?: {name: string, weight: number}[]
+    getData: () => Promise<T[]> | undefined,
     toggleSending: (arg0:boolean) => void,
     fillIn: (arg0:T) => void,
     render: (arg0:T) => JSX.Element
 };
 type State<T> = {
     data: T[],
+    loading: boolean,
     currentIndex: number
 };
 
@@ -24,17 +26,10 @@ export class CompletePrompt<T> extends Component<Props<T>, State<T>> {
         distance: 100,
         maxPatternLength: 32,
         minMatchCharLength: 1,
-        keys: [
-            {
-                name: "pattern",
-                weight: 0.7
-            }, {
-                name: "docs",
-                weight: 0.3
-            }
-        ]
+        keys: this.props.keys
     }
     state = {
+        loading: false,
         data: [],
         currentIndex: -1
     }
@@ -73,28 +68,42 @@ export class CompletePrompt<T> extends Component<Props<T>, State<T>> {
             }
             this.props.toggleSending(outOfRange());
         })
+        this.updateValues();
     }
 
-    componentDidUpdate(prevProps:Props<T>){
-        if (this.props.value !== prevProps.value){
-            this.props.getData().then(val => {
+    updateValues(){
+        const val = this.props.getData();
+        if (val){
+            this.setState({loading: true});
+            val.then(val => {
                 if (val){
                     const fuse = new Fuse(val, this.fuseOptions);
                     const results = fuse.search(this.props.value);
                     this.setState({
                         data: results as T[],
-                        currentIndex: -1
+                        currentIndex: -1,
+                        loading: false
                     });
                 }
             })
         }
     }
 
+    componentDidUpdate(prevProps:Props<T>, prevState:State<T>){
+        if (this.props.value !== prevProps.value){
+            console.debug("Prop value changed!");
+            this.updateValues();
+        }
+    }
+
     render(){
         const offset = (this.state.data.length * 20);
         if (!this.props.show){
             return <></>;
         }
+        if (this.state.loading){
+            return <div className="complete-prompt" style={{top: -offset}}>Loading...</div>
+        }
         return <ul className="complete-prompt" style={{top: -offset}}>
             {(this.state.data||[]).map((val:T, i) => 
                 <CompleteEntry<T> setActive={(active) => {
diff --git a/ui/src/components/TerminalInput.tsx b/ui/src/components/TerminalInput.tsx
index 16ed221..3560107 100644
--- a/ui/src/components/TerminalInput.tsx
+++ b/ui/src/components/TerminalInput.tsx
@@ -57,29 +57,31 @@ export class TerminalInput extends Component<{}, State> {
         switch(input.key){
             case "Enter":
                 input.preventDefault();
-                if (this.state.stepRef !== undefined && this.state.val.length > 0){
+                if (input.shiftKey){
                     this.handleSubmit(document.getElementById("terminal-input")!);
-                //TODO: if user is pressing Enter repeatedly tell them they need to use Shift
-                } else if (input.shiftKey){
-                    this.handleSubmit(target);
                 }
+                // if (this.state.stepRef !== undefined && this.state.val.length > 0){
+                //     this.handleSubmit(document.getElementById("terminal-input")!);
+                // //TODO: if user is pressing Enter repeatedly tell them they need to use Shift
+                // } else if (input.shiftKey){
+                //     this.handleSubmit(target);
+                // }
             break;
             case "Tab":
-                input.preventDefault();
-                if (this.state.stepRef && this.state.stepRef !== undefined && this.getStepRef().args){
-                    let offset = this.state.val.length - this.getStepRef().pattern.length;
-                    //TODO: ugh
-                    let i = 0;
-                    const args = this.getStepRef().args as Argument[];
-                    while(target.selectionStart! < args[i].start!){
-                        i++;
-                        if (i > args.length){
-                            i = 0;
-                            break;
+                if (this.state.parsedInput.length > 0){
+                    input.preventDefault();
+                    const active = document.activeElement;
+                    if (active && active.classList.contains('arg')){
+                        const id = Number.parseInt(active.getAttribute('tabIndex')!);
+                        const inputs = document.getElementsByClassName('arg');
+                        if (id + 1 >= inputs.length){
+                            (inputs.item(0)! as HTMLElement).focus();
+                        } else {
+                            (inputs.item(id + 1)! as HTMLElement).focus();
                         }
                     }
                 }
-                break;
+            break;
             case "Escape":
                 input.preventDefault();
                 this.setState({
@@ -88,21 +90,7 @@ export class TerminalInput extends Component<{}, State> {
                 });
             break;
             default:
-                if (this.state.stepRef){
-                    let i = 0;
-                    let accum = 0;
-                    const cursor = target.selectionStart;
-                    for (let val of (this.state.parsedInput as string[])){
-                        accum += val.length;
-                        console.debug(`cursor: ${cursor} accum: ${accum} for val ${val}`);
-                        if (cursor! <= accum){
-                            break;
-                        }
-                        i++;
-                    }
-                    target.selectionStart = cursor;
-                    console.log(`index: ${i} cursor: ${cursor}`);
-                }
+
             break;
         }
         keyDispatcher.dispatch(input);
@@ -143,21 +131,32 @@ export class TerminalInput extends Component<{}, State> {
 
     render(){
         let val = this.state.parsedInput.length > 0 && false ? this.state.parsedInput.join("") : this.state.val;
-        let input = <input autoFocus id="terminal-input" style={{width: "85%"}} value={val} onInput={this.handleChange} onKeyDownCapture={this.handleInput}/>;
+        let input = <input autoFocus id="terminal-input" style={{width: "85%"}} value={val} onChange={this.handleChange} onKeyDownCapture={this.handleInput}/>;
         if (this.state.parsedInput.length > 0){
-            input = <div id="terminal-input" onKeyDownCapture={this.handleInput}>
+            const focusedInput = document.activeElement as HTMLInputElement;
+            input = <>
+                <CompletePrompt<{val: string}> value={focusedInput.value}
+                    getData={() =>StepManager.get().getSuggestionForArg(this.state.stepRef!, focusedInput.tabIndex)}
+                    fillIn={(val) => focusedInput.value = val.val}
+                    render={(arg) => <span>{arg.val}</span>}
+                    show={focusedInput !== undefined}
+                    toggleSending={(arg) => this.setState({canSend: arg})}
+                    keys={[{
+                        name: "val",
+                        weight: 1
+                    }]}
+                />
+                <span id="terminal-input" onKeyDownCapture={this.handleInput}>
                 {
                     this.state.parsedInput.map((val, i) => 
-                        typeof(val) === "string" ? <span key={`const_${i}`}>{val}</span> : <input onKeyPress={(event) => {
-                            if (event.key === "Enter"){
-                                this.handleSubmit(document.getElementById("terminal-input") as HTMLInputElement);
-                            }
-                        }} key={`var_${val}`} className='arg' id={`arg-${i}`}
-                        autoFocus={val === 0}
-                        />
+                        typeof(val) === "string" ? 
+                            <span key={`const_${i}`}>{val}</span> : 
+                            <input key={`var_${val}`} className='arg' id={`arg-${val}`}
+                            autoFocus={val === 0} tabIndex={val} onChange={() => this.forceUpdate()}
+                            />
                     )
                 }
-            </div>;
+                </span></>;
         }
         return <div style={{width: "100% "}}>
             <CompletePrompt<Step> value={this.state.val} 
@@ -166,6 +165,15 @@ export class TerminalInput extends Component<{}, State> {
                 fillIn={this.onSetStep}
                 getData={() => StepManager.get().getSteps()}
                 render={(step) => <span>{step.pattern}</span>}
+                keys={[
+                    {
+                        name: "pattern",
+                        weight: 0.7
+                    }, {
+                        name: "docs",
+                        weight: 0.3
+                    }
+                ]}
             />
             {input}
             <input type="submit"/>
diff --git a/ui/src/interop/SuggestionManager.ts b/ui/src/interop/SuggestionManager.ts
deleted file mode 100644
index 00469ed..0000000
--- a/ui/src/interop/SuggestionManager.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-
-export type Suggestion = {
-
-}
-
-export class SuggestionManager {
-
-    private static instance: SuggestionManager;
-
-    public static get(){
-        if (!this.instance){
-            this.instance = new SuggestionManager();
-        }
-        return this.instance;
-    }
-
-    public getSuggestions(suggProvider:string){
-        
-    }
-
-}
-
diff --git a/ui/src/interop/stepManager.ts b/ui/src/interop/stepManager.ts
index a75e259..d2da15f 100644
--- a/ui/src/interop/stepManager.ts
+++ b/ui/src/interop/stepManager.ts
@@ -54,6 +54,36 @@ export class StepManager {
         })
     }
 
+    getSuggestionForArg(step:Step, i:number, stepArgs:string[] = []):Promise<{val: string}[]> | undefined{
+        if (step.args){
+            const args = step.args;
+            
+            const arg = args[i];
+            if (arg.suggProvider !== ""){
+                return new Promise((resolve) => {
+                    if (i < 0 || i >= args.length){
+                        resolve([]);
+                    }
+                    else {
+                        fetch(`${AppConfig.getServerUrl()}/suggestion`, {
+                            method: "POST",
+                            body: JSON.stringify({
+                                step: step.pattern,
+                                args: stepArgs,
+                                argId: i
+                            })
+                        }).then((r => r.json())).then((suggs:string[]) => {
+                            console.log(suggs.map((v) => ({val: v})));
+                            resolve(suggs.map((v) => ({val: v})))
+                        })
+                    }
+                });
+            }
+        } else {
+            return undefined;
+        }
+    }
+
     fetchSteps(callback:(value?:Step[]) => void | undefined){
         fetch(`${AppConfig.getServerUrl()}/liststeps`).then((r) => r.json()).then((steps:Step[]) => {
             this.stepRepo = this.analyzeParams(steps);