Reintegrated server data for courses, still some work to do but mostly works.