Yep, it's been bothering me a little how messy the player code is, but I was planning on waiting until we start focusing on the ui before doing anything fancy. We can definitely make something nice and modular.