start moving more GLM1 stuff to GLM2