migrate to new keyhandling  (wip)