adding basic key handling