Getting broken features working again, still mostly broken, but normal playback works