Pass command to Completion as well
Refactored tab completion to start being command dependent