Restructure event handling, temporarily disable resolvePlayer test