Add object switching, and an attempt at sky-frame style switching