Basic typeahead functionality for whispers.  Clean up of code

Signed-off-by: Dave <davidajberner@gmail.com>