Some changes... needs work on keyboard transfer