Started adding keyboard support