Refactor how we get incidents

This will need testing by someone.