Add GA support, and make things a bit more interesting