Hopefully a fixed keyboard class soon!