Added testing and reworked input to expose completer