Updated classes and added keystoke wait