refactor handlers, add riker and picard