Updates from the calls

This has most the updates from the call, still more coming, but opening the PR now so we can all get on the same page.
Eventually we'll want a way for this to automatically set the list to the current year plus the following 5 years, but we can cross that bridge when we get the bug next year!  You should probably at least make this list hardcoded in one spot though for both undergrad and grad.