Refactor to allow for FutureLearn; broke Coursera