Finish implementing keyboard