Does this need to have backwards compat code to handle old-style locations? Should it also handle new-style course keys?