Lots of changes for getting courses working