Beginning to add key handling