Some keyboard stuff
Rounding out the API stuff