Revert "Revert "Got rid of opportunities from draft branch for now""

This reverts commit 0a862d0e7b163439ee3050216a3897ed1369b70b.
Merge branch 'master' of https://github.com/cssu/cssu.cdf.toronto.edu