Trying to be proactive this time

Hopefully didn't miss any