Last minute refactor of course breaks things