Started updating to allow keyboard threading as well