More CDM and SR prep stuff for completed/location/goals/context