Move and fix SkyPlayer stuff