Slim down event handling for focus events
Reintroduce model hierarchy to fix playback bug