Gas Giant rewrite (#2803)