Trying to get this working with the master-branch gmad.