Additions to GridMaster