WIP
Fix some event propagation + primary evt handling