3.6/dev intrepid svoigt

The type ahead part needs to be in there.