Grid alpha

Major merge! Moving all alpha work to master.