Add ability to forecast future grades
Merge upstream