Revert "focus on upcoming for now"

This reverts commit 793ece7cc1ce798d97c7a366e8122ff929f94814.
Revert "Move towards a list of future and past events"

This reverts commit 94fded78d82c0fa7edd8c03d8ce5a282eb580462.