Have keyboard control working-ish