Mostly working -- just need to fix something with upcoming events