Working on getting Catherine's changes running on vm-006