Put ClientKeyListener in an actual class file ;)
Add PrimaryCallbackListener (never got committed, but is referred to in
other code)